diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java
index 9a1db640..3fd155cf 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java
@@ -1,27 +1,18 @@
 package org.embeddedt.modernfix.common.mixin.perf.resourcepacks;
 
-import net.minecraft.server.packs.PackResources;
 import net.minecraft.server.packs.resources.ReloadableResourceManager;
-import net.minecraft.util.Unit;
 import org.embeddedt.modernfix.ModernFix;
-import org.embeddedt.modernfix.resources.ICachingResourcePack;
+import org.embeddedt.modernfix.resources.PackResourcesCacheEngine;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-
 @Mixin(ReloadableResourceManager.class)
 public class ReloadableResourceManagerMixin {
     @Inject(method = "createReload", at = @At("HEAD"))
-    private void invalidateResourceCaches(Executor backgroundExecutor, Executor gameExecutor, CompletableFuture<Unit> waitingFor, List<PackResources> resourcePacks, CallbackInfoReturnable<?> cir) {
+    private void invalidateResourceCaches(CallbackInfoReturnable<?> cir) {
         ModernFix.LOGGER.info("Invalidating pack caches");
-        for(PackResources pack : resourcePacks) {
-            if(pack instanceof ICachingResourcePack)
-                ((ICachingResourcePack)pack).invalidateCache();
-        }
+        PackResourcesCacheEngine.invalidate();
     }
 }
diff --git a/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java b/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java
index a8333fa3..8c592cdf 100644
--- a/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java
+++ b/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java
@@ -154,4 +154,20 @@ public class PackResourcesCacheEngine {
         }
         return resources;
     }
+
+    private static final WeakHashMap<ICachingResourcePack, Boolean> cachingPacks = new WeakHashMap<>();
+    public static void track(ICachingResourcePack pack) {
+        synchronized (cachingPacks) {
+            cachingPacks.put(pack, Boolean.TRUE);
+        }
+    }
+
+    public static void invalidate() {
+        synchronized (cachingPacks) {
+            cachingPacks.keySet().forEach(pack -> {
+                if(pack != null)
+                    pack.invalidateCache();
+            });
+        }
+    }
 }
diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java
index f52c70dd..0eb7453d 100644
--- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java
+++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java
@@ -32,6 +32,7 @@ public abstract class ModNioResourcePackMixin implements ICachingResourcePack {
     @Inject(method = "<init>", at = @At("RETURN"))
     private void cacheResources(CallbackInfo ci) {
         invalidateCache();
+        PackResourcesCacheEngine.track(this);
     }
 
     @Override
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java
index bb6c7d8c..bfb3d510 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java
@@ -27,7 +27,8 @@ public abstract class ModFileResourcePackMixin implements ICachingResourcePack {
 
     @Inject(method = "<init>", at = @At("TAIL"))
     private void cacheResources(String packName, Path source, CallbackInfo ci) {
-        this.cacheEngine = null;
+        invalidateCache();
+        PackResourcesCacheEngine.track(this);
     }
 
     private PackResourcesCacheEngine generateResourceCache() {