diff --git a/src/main/java/it/cavallium/dbengine/database/disk/ClockCacheFactory.java b/src/main/java/it/cavallium/dbengine/database/disk/ClockCacheFactory.java
deleted file mode 100644
index 6949452..0000000
--- a/src/main/java/it/cavallium/dbengine/database/disk/ClockCacheFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package it.cavallium.dbengine.database.disk;
-
-import org.rocksdb.Cache;
-import org.rocksdb.ClockCache;
-
-public class ClockCacheFactory implements CacheFactory {
-
-	@Override
-	public Cache newCache(long size) {
-		return new ClockCache(size);
-	}
-}
diff --git a/src/main/java/it/cavallium/dbengine/database/disk/HyperClockCacheFactory.java b/src/main/java/it/cavallium/dbengine/database/disk/HyperClockCacheFactory.java
new file mode 100644
index 0000000..299b6bf
--- /dev/null
+++ b/src/main/java/it/cavallium/dbengine/database/disk/HyperClockCacheFactory.java
@@ -0,0 +1,12 @@
+package it.cavallium.dbengine.database.disk;
+
+import org.rocksdb.Cache;
+import org.rocksdb.HyperClockCache;
+
+public class HyperClockCacheFactory implements CacheFactory {
+
+	@Override
+	public Cache newCache(long size) {
+		return new HyperClockCache(size, 0, -1, false);
+	}
+}
diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java
index 6548152..7c2757d 100644
--- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java
+++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java
@@ -103,7 +103,7 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa
 	private static final boolean DELETE_LOG_FILES = false;
 	private static final boolean FOLLOW_ROCKSDB_OPTIMIZATIONS = true;
 	private static final boolean USE_CLOCK_CACHE
-			= Boolean.parseBoolean(System.getProperty("it.cavallium.dbengine.clockcache.enable", "false"));
+			= Boolean.parseBoolean(System.getProperty("it.cavallium.dbengine.clockcache.enable", "true"));
 	private static final boolean PARANOID_CHECKS
 			= Boolean.parseBoolean(System.getProperty("it.cavallium.dbengine.checks.paranoid", "true"));
 	private static final boolean VERIFY_COMPRESSION
@@ -116,7 +116,7 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa
 			= Boolean.parseBoolean(System.getProperty("it.cavallium.dbengine.checks.forcecolumnfamilyconsistencychecks", "true"));
 	private static final InfoLogLevel LOG_LEVEL = InfoLogLevel.getInfoLogLevel(Byte.parseByte(System.getProperty("it.cavallium.dbengine.log.levelcode", "" + InfoLogLevel.WARN_LEVEL.getValue())));
 
-	private static final CacheFactory CACHE_FACTORY = USE_CLOCK_CACHE ? new ClockCacheFactory() : new LRUCacheFactory();
+	private static final CacheFactory CACHE_FACTORY = USE_CLOCK_CACHE ? new HyperClockCacheFactory() : new LRUCacheFactory();
 	private static final boolean ALLOW_SNAPSHOTS = Boolean.parseBoolean(System.getProperty("it.cavallium.dbengine.snapshots.allow", "true"));
 
 	static {