diff --git a/src/main/java/caosdb/server/caching/JCSCacheHelper.java b/src/main/java/caosdb/server/caching/JCSCacheHelper.java
index e04e4e54cdaaa1575875d92bb453e55feb85b23d..1a384873e46e07c967d2fc4ef25b2aada3d76576 100644
--- a/src/main/java/caosdb/server/caching/JCSCacheHelper.java
+++ b/src/main/java/caosdb/server/caching/JCSCacheHelper.java
@@ -24,8 +24,6 @@
  */
 package caosdb.server.caching;
 
-import caosdb.server.CaosDBServer;
-import caosdb.server.ServerProperties;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -36,6 +34,8 @@ import org.apache.commons.jcs.JCS;
 import org.apache.commons.jcs.access.behavior.ICacheAccess;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import caosdb.server.CaosDBServer;
+import caosdb.server.ServerProperties;
 
 /**
  * A CacheHelper implementation which is configured statically via the {@link
@@ -88,6 +88,8 @@ public class JCSCacheHelper implements CacheHelper {
       }
       logger.info("Configuring JCS Caching with {}", config);
     }
+    
+    // If the JCS config is updated/reset, it has to be shut down before.
     JCS.shutdown();
     JCS.setConfigProperties(config);
   }