diff --git a/src/main/java/dev/micle/xptools/events/common/OnBlockBreakEventHandler.java b/src/main/java/dev/micle/xptools/events/common/OnBlockBreakEventHandler.java
index 2dfd2a8..688e841 100644
--- a/src/main/java/dev/micle/xptools/events/common/OnBlockBreakEventHandler.java
+++ b/src/main/java/dev/micle/xptools/events/common/OnBlockBreakEventHandler.java
@@ -45,7 +45,9 @@ public class OnBlockBreakEventHandler {
             );
 
             // Save operations to cache
-            OperationCache.addBlockBreakCacheEntry(block_id, operations);
+            if (Config.Server.optimizationUseCache.get()) {
+                OperationCache.addBlockBreakCacheEntry(block_id, operations);
+            }
         }
 
         // Add global operations before all others
diff --git a/src/main/java/dev/micle/xptools/events/common/OnLivingExperienceDropEventHandler.java b/src/main/java/dev/micle/xptools/events/common/OnLivingExperienceDropEventHandler.java
index 91f5917..f0f2b70 100644
--- a/src/main/java/dev/micle/xptools/events/common/OnLivingExperienceDropEventHandler.java
+++ b/src/main/java/dev/micle/xptools/events/common/OnLivingExperienceDropEventHandler.java
@@ -45,7 +45,9 @@ public class OnLivingExperienceDropEventHandler {
             );
 
             // Save operations to cache
-            OperationCache.addEntityKillCacheEntry(entity_id, operations);
+            if (Config.Server.optimizationUseCache.get()) {
+                OperationCache.addEntityKillCacheEntry(entity_id, operations);
+            }
         }
 
         // Add global operations before all others