--- a/src/Java.st	Fri Apr 08 14:14:47 2011 +0000
+++ b/src/Java.st	Fri Apr 08 15:08:34 2011 +0000
@@ -14,9 +14,10 @@
 Object subclass:#Java
 	instanceVariableNames:''
 	classVariableNames:'Classes UnresolvedClassRefs Release ClassPath SourceDirectories
-		JavaHome InternedStrings Java_lang_String Java_lang_Class
-		PrettyPrintStyle LastArgumentString Threads ExcludedClassPath
-		FailedToLoadClasses SourceCache SourceArchiveCache'
+		CacheDirectory JavaHome InternedStrings Java_lang_String
+		Java_lang_Class PrettyPrintStyle LastArgumentString Threads
+		ExcludedClassPath FailedToLoadClasses SourceCache
+		SourceArchiveCache'
 	poolDictionaries:''
 	category:'Languages-Java-Support'
 !
@@ -220,9 +221,14 @@
 
 cacheDirectory
 
-    ^Filename homeDirectory / '.smalltalk' / 'libjava'
+    CacheDirectory ifNil:[
+        CacheDirectory := Filename homeDirectory / '.smalltalk' / 'libjava' / 'caches' /
+            ((stx_libjava svnRepositoryUrlBase copyReplaceAll:$/ with:$_) replaceAll:$: with:$_)
+    ].
+    ^CacheDirectory
 
     "Created: / 08-04-2011 / 15:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-04-2011 / 16:58:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 classPath