Index: trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java	(revision 4829)
+++ trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java	(revision 4830)
@@ -101,4 +101,12 @@
             cPath = Main.pref.getCacheDirectory() + File.separator + cPath;
         }
+        // Migrate to new cache directory. Remove 2012-06
+        {
+            File oldPath = new File(Main.pref.getPreferencesDirFile(), "wms-cache");
+            File newPath = new File(cPath);
+            if (oldPath.exists() && !newPath.exists()) {
+                oldPath.renameTo(newPath);
+            }
+        }
         return cPath;
     }