diff --git a/Penumbra/Collections/Cache/EqdpCache.cs b/Penumbra/Collections/Cache/EqdpCache.cs
index f3475c7e..7139bb72 100644
--- a/Penumbra/Collections/Cache/EqdpCache.cs
+++ b/Penumbra/Collections/Cache/EqdpCache.cs
@@ -1,4 +1,3 @@
-using FFXIVClientStructs.FFXIV.Client.Graphics.Render;
 using OtterGui;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;
@@ -28,7 +27,10 @@ public sealed class EqdpCache(MetaFileManager manager, ModCollection collection)
     }
 
     public override void ResetFiles()
-        => Manager.SetFile(null, MetaIndex.Eqp);
+    {
+        foreach (var t in CharacterUtilityData.EqdpIndices)
+            Manager.SetFile(null, t);
+    }
 
     protected override void IncorporateChangesInternal()
     {
@@ -89,8 +91,8 @@ public sealed class EqdpCache(MetaFileManager manager, ModCollection collection)
         var mask      = Eqdp.Mask(identifier.Slot);
         if ((origEntry & mask) == entry)
             return false;
-
-        file[identifier.SetId] = (entry & ~mask) | origEntry;
+        
+        file[identifier.SetId] = (origEntry & ~mask) | entry;
         return true;
     }
 
diff --git a/Penumbra/Collections/Cache/EstCache.cs b/Penumbra/Collections/Cache/EstCache.cs
index 412dd322..8ee530cc 100644
--- a/Penumbra/Collections/Cache/EstCache.cs
+++ b/Penumbra/Collections/Cache/EstCache.cs
@@ -55,7 +55,12 @@ public sealed class EstCache(MetaFileManager manager, ModCollection collection)
     }
 
     public override void ResetFiles()
-        => Manager.SetFile(null, MetaIndex.Eqp);
+    {
+        Manager.SetFile(null, MetaIndex.FaceEst);
+        Manager.SetFile(null, MetaIndex.HairEst);
+        Manager.SetFile(null, MetaIndex.BodyEst);
+        Manager.SetFile(null, MetaIndex.HeadEst);
+    }
 
     protected override void IncorporateChangesInternal()
     {