diff --git a/src/main/java/org/caosdb/server/CaosDBServer.java b/src/main/java/org/caosdb/server/CaosDBServer.java
index e843645cd5570e528f37f601c87e9f48b6299c65..5781f2e1ae1df961e6c85eb2b469996950c56cf9 100644
--- a/src/main/java/org/caosdb/server/CaosDBServer.java
+++ b/src/main/java/org/caosdb/server/CaosDBServer.java
@@ -154,6 +154,7 @@ public class CaosDBServer extends Application {
       parseArguments(args);
       initScheduler();
       initServerProperties();
+      initCaching();
       initTimeZone();
       initOneTimeTokens();
       initShiro();
@@ -197,6 +198,9 @@ public class CaosDBServer extends Application {
 
   public static void initServerProperties() throws IOException {
     SERVER_PROPERTIES = ServerProperties.initServerProperties();
+  }
+
+  public static void initCaching() {
     USE_CACHE =
         !Boolean.parseBoolean(CaosDBServer.getServerProperty(ServerProperties.KEY_CACHE_DISABLE));
   }
diff --git a/src/test/java/org/caosdb/server/caching/TestCaching.java b/src/test/java/org/caosdb/server/caching/TestCaching.java
index 1aba2ff6f16cea7a1f62e84e50e2cc9797114e27..26abd47bc16bb60a59baf85c7d991ceb707d5b86 100644
--- a/src/test/java/org/caosdb/server/caching/TestCaching.java
+++ b/src/test/java/org/caosdb/server/caching/TestCaching.java
@@ -17,6 +17,7 @@ public class TestCaching {
   @BeforeAll
   public static void init() throws IOException {
     CaosDBServer.initServerProperties();
+    CaosDBServer.initCaching();
     JCSCacheHelper.init();
   }
 
diff --git a/src/test/java/org/caosdb/server/caching/TestNoCaching.java b/src/test/java/org/caosdb/server/caching/TestNoCaching.java
index 4fc73adf89f9355d1ff6addcd0f71fd9eda4e653..db47853f1599259ae680d090318f9e1771772ef2 100644
--- a/src/test/java/org/caosdb/server/caching/TestNoCaching.java
+++ b/src/test/java/org/caosdb/server/caching/TestNoCaching.java
@@ -17,6 +17,7 @@ public class TestNoCaching {
   public static void init() throws IOException {
     CaosDBServer.initServerProperties();
     CaosDBServer.setProperty(ServerProperties.KEY_CACHE_DISABLE, "TRUE");
+    CaosDBServer.initCaching();
     JCSCacheHelper.init();
   }