diff --git a/api/src/main/java/com/viaversion/viaversion/api/connection/StorableObject.java b/api/src/main/java/com/viaversion/viaversion/api/connection/StorableObject.java
index 1d7a41bb3..69dda615f 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/connection/StorableObject.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/connection/StorableObject.java
@@ -29,4 +29,13 @@ package com.viaversion.viaversion.api.connection;
  * @see UserConnection#put(StorableObject)
  */
 public interface StorableObject {
+
+    /**
+     * Returns whether the object should be uncached on a server switch.
+     *
+     * @return whether the object should be uncached on a server switch
+     */
+    default boolean clearOnServerSwitch() {
+        return true;
+    }
 }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/connection/UserConnection.java b/api/src/main/java/com/viaversion/viaversion/api/connection/UserConnection.java
index 721bd0eac..5fa9d7d16 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/connection/UserConnection.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/connection/UserConnection.java
@@ -92,6 +92,7 @@ public interface UserConnection {
 
     /**
      * Adds an entity tracker to the user connection.
+     * Does not override existing entity trackers.
      *
      * @param protocolClass protocol class
      * @param tracker       entity tracker
@@ -100,9 +101,18 @@ public interface UserConnection {
 
     /**
      * Clear stored objects and entity trackers.
-     * Used for Bungee when switching servers.
      */
-    void clearStoredObjects();
+    default void clearStoredObjects() {
+        clearStoredObjects(false);
+    }
+
+    /**
+     * Clear stored objects and entity trackers.
+     * If cleared for a proxy server switch, some stored objects and tracker data will be retained.
+     *
+     * @param isServerSwitch whether the clear is due to a server switch
+     */
+    void clearStoredObjects(boolean isServerSwitch);
 
     /**
      * Sends a raw packet to the connection on the current thread.
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java
index 95ea74873..5250b8082 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java
@@ -184,7 +184,7 @@ public class BungeeServerHandler implements Listener {
                     // Refresh the pipes
                     List<ProtocolPathEntry> protocolPath = Via.getManager().getProtocolManager().getProtocolPath(info.getProtocolVersion(), protocolId);
                     ProtocolPipeline pipeline = user.getProtocolInfo().getPipeline();
-                    user.clearStoredObjects();
+                    user.clearStoredObjects(true);
                     pipeline.cleanPipes();
                     if (protocolPath == null) {
                         // TODO Check Bungee Supported Protocols? *shrugs*
diff --git a/common/src/main/java/com/viaversion/viaversion/connection/UserConnectionImpl.java b/common/src/main/java/com/viaversion/viaversion/connection/UserConnectionImpl.java
index cab851d3f..9d2eb49f8 100644
--- a/common/src/main/java/com/viaversion/viaversion/connection/UserConnectionImpl.java
+++ b/common/src/main/java/com/viaversion/viaversion/connection/UserConnectionImpl.java
@@ -115,13 +115,22 @@ public class UserConnectionImpl implements UserConnection {
 
     @Override
     public void addEntityTracker(Class<? extends Protocol> protocolClass, EntityTracker tracker) {
-        entityTrackers.put(protocolClass, tracker);
+        if (!entityTrackers.containsKey(protocolClass)) {
+            entityTrackers.put(protocolClass, tracker);
+        }
     }
 
     @Override
-    public void clearStoredObjects() {
-        storedObjects.clear();
-        entityTrackers.clear();
+    public void clearStoredObjects(boolean isServerSwitch) {
+        if (isServerSwitch) {
+            storedObjects.values().removeIf(StorableObject::clearOnServerSwitch);
+            for (EntityTracker tracker : entityTrackers.values()) {
+                tracker.clearEntities();
+            }
+        } else {
+            storedObjects.clear();
+            entityTrackers.clear();
+        }
     }
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java
index 09735a366..4911ce38d 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java
@@ -287,7 +287,9 @@ public final class Protocol1_19To1_18_2 extends AbstractProtocol<ClientboundPack
     @Override
     public void init(final UserConnection user) {
         user.put(new SequenceStorage());
-        user.put(new DimensionRegistryStorage());
+        if (!user.has(DimensionRegistryStorage.class)) {
+            user.put(new DimensionRegistryStorage());
+        }
         addEntityTracker(user, new EntityTrackerBase(user, Entity1_19Types.PLAYER));
     }
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java
index cda1d95e9..85fc2b4c8 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java
@@ -34,4 +34,9 @@ public final class DimensionRegistryStorage implements StorableObject {
     public void setDimensions(final Map<CompoundTag, String> dimensions) {
         this.dimensions = dimensions;
     }
+
+    @Override
+    public boolean clearOnServerSwitch() {
+        return false;
+    }
 }