Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 12753)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 12755)
@@ -33,5 +33,4 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.UndoRedoHandler;
-import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
 import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
@@ -757,5 +756,4 @@
         if (!GraphicsEnvironment.isHeadless()) {
             ImageProvider.shutdown(false);
-            JCSCacheManager.shutdown();
         }
         try {
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 12753)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 12755)
@@ -76,4 +76,5 @@
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueListener;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -385,4 +386,5 @@
         if (!GraphicsEnvironment.isHeadless()) {
             worker.shutdown();
+            JCSCacheManager.shutdown();
         }
         if (mainFrame != null) {