Index: applications/editors/josm/plugins/imagerycache/nbproject/project.xml
===================================================================
--- applications/editors/josm/plugins/imagerycache/nbproject/project.xml	(revision 29690)
+++ applications/editors/josm/plugins/imagerycache/nbproject/project.xml	(revision 29769)
@@ -17,8 +17,6 @@
                 </source-folder>
                 <source-folder>
-                    <label>src</label>
-                    <type>java</type>
-                    <location>src</location>
-                    <encoding>UTF-8</encoding>
+                    <label>F:\Java\josm\core\src</label>
+                    <location>F:\Java\josm\core\src</location>
                 </source-folder>
                 <source-folder>
@@ -27,8 +25,4 @@
                     <location>F:\Java\josm\core\src</location>
                     <encoding>UTF-8</encoding>
-                </source-folder>
-                <source-folder>
-                    <label>F:\Java\josm\core\src</label>
-                    <location>F:\Java\josm\core\src</location>
                 </source-folder>
             </folders>
@@ -54,8 +48,4 @@
                 <items>
                     <source-folder style="packages">
-                        <label>src</label>
-                        <location>src</location>
-                    </source-folder>
-                    <source-folder style="packages">
                         <label>F:\Java\josm\core\src</label>
                         <location>F:\Java\josm\core\src</location>
@@ -77,10 +67,6 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
             <compilation-unit>
-                <package-root>src</package-root>
+                <package-root>F:\Java\josm\core\src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
-            </compilation-unit>
-            <compilation-unit>
-                <package-root>F:\Java\josm\core\src</package-root>
                 <source-level>1.6</source-level>
             </compilation-unit>
Index: applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java
===================================================================
--- applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java	(revision 29690)
+++ applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java	(revision 29769)
@@ -14,4 +14,6 @@
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
@@ -24,5 +26,5 @@
  * @author Alexei Kasatkin, based on OsmFileCacheTileLoader by @author Jan Peter Stotz, @author Stefan Zeller
  */
-class OsmDBTilesLoader extends OsmTileLoader {
+class OsmDBTilesLoader extends OsmTileLoader implements CachedTileLoader {
     
     
@@ -49,4 +51,14 @@
     }
 
+    @Override
+    public void clearCache(TileSource source) {
+        clearCache(source, null);
+    }
+
+    @Override
+    public void clearCache(TileSource source, TileClearController controller) {
+        dao.cleanStorage(source.getName());
+    }
+    
     protected class DatabaseLoadJob implements TileJob {
 
Index: applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java
===================================================================
--- applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java	(revision 29690)
+++ applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java	(revision 29769)
@@ -6,4 +6,5 @@
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 
@@ -186,3 +187,17 @@
     }
 
+    public void cleanStorage(String name) {
+        Main.info("Cleaning storage: {0}", name);
+        dbs.get(name).close();
+        for (int t=0; t<20; t++) {
+            try {
+                String fname = getDBFileName(name, t);
+                File f = new File(cacheFolder, fname);
+                if (!f.exists() || !f.canWrite()) continue;
+                f.delete();
+            } catch (Exception e) {
+                Main.warn("Can not delete file");
+            }
+        }
+    }
 }