diff --git a/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java b/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java
index 57f860a3..b822aa85 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java
@@ -32,6 +32,7 @@ import me.libraryaddict.disguise.utilities.metrics.MetricsInitalizer;
 import me.libraryaddict.disguise.utilities.packets.PacketsManager;
 import me.libraryaddict.disguise.utilities.params.ParamInfoManager;
 import me.libraryaddict.disguise.utilities.parser.DisguiseParser;
+import me.libraryaddict.disguise.utilities.reflection.ClassMappings;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
 import me.libraryaddict.disguise.utilities.sounds.SoundManager;
@@ -230,6 +231,8 @@ public class LibsDisguises extends JavaPlugin {
                 DisguiseConfig.setUsingReleaseBuilds(false);
             }
 
+            ClassMappings.loadMappingsCache(getDataFolder());
+
             ReflectionManager.init();
 
             PacketsManager.init();
@@ -331,6 +334,7 @@ public class LibsDisguises extends JavaPlugin {
     @Override
     public void onDisable() {
         DisguiseUtilities.saveDisguises();
+        ClassMappings.saveMappingsCache(getDataFolder());
 
         reloaded = true;
     }
diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ClassMappings.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ClassMappings.java
index cbf9ec8b..24ce4f92 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ClassMappings.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ClassMappings.java
@@ -1,6 +1,14 @@
 package me.libraryaddict.disguise.utilities.reflection;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 
 public class ClassMappings {
     private static HashMap<String, String> classLocations = new HashMap<>();
@@ -53,4 +61,41 @@ public class ClassMappings {
         }
         return s;
     }
+
+    public static void saveMappingsCache(File dataFolder) {
+        File mappingsCache = new File(dataFolder, "mappings_cache");
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(mappingsCache))) {
+            for (Map.Entry<String, String> entry : classLocations.entrySet()) {
+                if (!entry.getKey().equals(entry.getValue())) {
+                    writer.write(entry.getKey() + " " + entry.getValue() + "\n");
+                }
+            }
+        } catch (IOException e) {
+            // don't care if cache can't be saved
+            e.printStackTrace();
+        }
+    }
+
+    public static void loadMappingsCache(File dataFolder) {
+        File mappingsCache = new File(dataFolder, "mappings_cache");
+        try (BufferedReader reader = new BufferedReader(new FileReader(mappingsCache))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                String[] parts = line.split(" ", 2);
+                if (parts.length == 2) {
+                    // Check if class name is still valid
+                    try {
+                        Class.forName(parts[1]);
+                        classLocations.put(parts[0], parts[1]);
+                    } catch (ClassNotFoundException e) {
+                        // silently discard, we may have just changed versions
+                    }
+                }
+            }
+        } catch (FileNotFoundException e) {
+            // silently discard, it doesn't matter if the cache doesn't exist, we will just create it later
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file