Index: oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
===================================================================
--- oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java	(revision 1705679)
+++ oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java	(working copy)
@@ -481,7 +481,7 @@
                     + " bytes)");
 
             System.out.println("    -> compacting");
-            FileStore store = new FileStore(directory, 256, TAR_STORAGE_MEMORY_MAPPED);
+            FileStore store = openFileStore(directory);
             try {
                 CompactionStrategy compactionStrategy = new CompactionStrategy(
                         false, CompactionStrategy.CLONE_BINARIES_DEFAULT,
@@ -505,7 +505,7 @@
             }
 
             System.out.println("    -> cleaning up");
-            store = new FileStore(directory, 256, TAR_STORAGE_MEMORY_MAPPED);
+            store = openFileStore(directory);
             try {
                 store.cleanup();
             } finally {
@@ -523,6 +523,14 @@
         }
     }
 
+    private static FileStore openFileStore(File directory) throws IOException {
+        return FileStore
+                .newFileStore(directory)
+                .withCacheSize(256)
+                .withMemoryMapping(TAR_STORAGE_MEMORY_MAPPED)
+                .create();
+    }
+
     private static void checkpoints(String[] args) throws IOException {
         if (args.length == 0) {
             System.out