diff --git a/source/ehcache.xml b/source/ehcache.xml
index 7021839a..8c187f24 100644
--- a/source/ehcache.xml
+++ b/source/ehcache.xml
@@ -3,7 +3,7 @@
 	<!--
 	Persistent disk store location
 	-->
-	<diskStore path="${cache.disk.store.dir}" />
+	<diskStore path="${ehcache.disk.store.dir}" />
 	
 	<!--
 	Mandatory Default Cache configuration. These settings will be applied to caches
diff --git a/source/net/sourceforge/filebot/Main.java b/source/net/sourceforge/filebot/Main.java
index 4141d9cb..8b6dd154 100644
--- a/source/net/sourceforge/filebot/Main.java
+++ b/source/net/sourceforge/filebot/Main.java
@@ -338,7 +338,7 @@ public class Main {
 				final FileLock lock = handle.getChannel().tryLock();
 				if (lock != null) {
 					// setup cache dir for ehcache
-					System.setProperty("cache.disk.store.dir", cache.getAbsolutePath());
+					System.setProperty("ehcache.disk.store.dir", cache.getAbsolutePath());
 					
 					// make sure to orderly shutdown cache
 					Runtime.getRuntime().addShutdownHook(new Thread() {
@@ -371,7 +371,7 @@ public class Main {
 		}
 		
 		// use cache root itself as fail-safe fallback
-		System.setProperty("cache.disk.store.dir", cacheRoot.getAbsolutePath());
+		System.setProperty("ehcache.disk.store.dir", new File(cacheRoot, "default").getAbsolutePath());
 	}