diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java b/common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java
index b6fb8947..c2532596 100644
--- a/common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java
+++ b/common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java
@@ -14,4 +14,5 @@ public interface IExtendedModelBakery {
     ImmutableList<BlockState> getBlockStatesForMRL(StateDefinition<Block, BlockState> stateDefinition, ModelResourceLocation location);
     BakedModel bakeDefault(ResourceLocation modelLocation, ModelState state);
     UnbakedModel mfix$getUnbakedMissingModel();
+    void mfix$clearModels();
 }
diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
index d31ac804..288b4028 100644
--- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
+++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
@@ -19,6 +19,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import org.embeddedt.modernfix.duck.IExtendedModelBakery;
 import org.embeddedt.modernfix.ModernFix;
+import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -194,7 +195,14 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
 
     @Override
     public void clear() {
-        throw new UnsupportedOperationException();
+        if (ModernFixPlatformHooks.INSTANCE.isDevEnv()) {
+            ModernFix.LOGGER.warn("Clearing model registry");
+            permanentOverrides.clear();
+            bakedCache.clear();
+            ((IExtendedModelBakery)bakery).mfix$clearModels();
+        } else {
+            throw new UnsupportedOperationException();
+        }
     }
 
     @NotNull
diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
index bcaf7df4..6949cad8 100644
--- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
+++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
@@ -325,4 +325,10 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
     public UnbakedModel mfix$getUnbakedMissingModel() {
         return missingModel;
     }
+
+    @Override
+    public void mfix$clearModels() {
+        loadedModels.invalidateAll();
+        loadedBakedModels.invalidateAll();
+    }
 }
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
index fa94cd99..a98d7595 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
@@ -2,6 +2,7 @@ package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.RemovalCause;
 import com.google.common.cache.RemovalNotification;
 import com.google.common.collect.ForwardingMap;
 import com.google.common.collect.ImmutableList;
@@ -128,6 +129,12 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
     private <K, V> void onModelRemoved(RemovalNotification<K, V> notification) {
         if(!debugDynamicModelLoading)
             return;
+        // If the entry was replaced (happens because of the Minecraft model loading code structure), or
+        // was explicitly removed, we don't really care.
+        var reason = notification.getCause();
+        if (reason == RemovalCause.REPLACED || reason == RemovalCause.EXPLICIT) {
+            return;
+        }
         Object k = notification.getKey();
         if(k == null)
             return;
@@ -341,4 +348,10 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
     public UnbakedModel mfix$getUnbakedMissingModel() {
         return missingModel;
     }
+
+    @Override
+    public void mfix$clearModels() {
+        loadedModels.invalidateAll();
+        loadedBakedModels.invalidateAll();
+    }
 }