Index: /applications/editors/josm/plugins/imagery_cachexport/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagery_cachexport/build.xml	(revision 33747)
+++ /applications/editors/josm/plugins/imagery_cachexport/build.xml	(revision 33748)
@@ -11,5 +11,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="11197"/>
+    <property name="plugin.main.version" value="12847"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/AbstractImageryCacheExportAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/AbstractImageryCacheExportAction.java	(revision 33747)
+++ /applications/editors/josm/plugins/imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/AbstractImageryCacheExportAction.java	(revision 33748)
@@ -23,4 +23,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -255,5 +256,5 @@
                                   cacheKeyPrefix, keySet, objects);
         if (task != null) {
-            Main.worker.submit(task);
+            MainApplication.worker.submit(task);
         }
     }
Index: /applications/editors/josm/plugins/imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/ImageryTileExportDialog.java
===================================================================
--- /applications/editors/josm/plugins/imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/ImageryTileExportDialog.java	(revision 33747)
+++ /applications/editors/josm/plugins/imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/ImageryTileExportDialog.java	(revision 33748)
@@ -20,4 +20,5 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -55,5 +56,5 @@
         exportDir.setHint(tr("file system path"));
         exportDir.setToolTipText(tr("File system path the tiles are exported to."));
-        exportDir.setText(Main.pref.get(EXPORT_DIR_PNAME, null));
+        exportDir.setText(Config.getPref().get(EXPORT_DIR_PNAME, null));
         exportDir.getDocument().addDocumentListener(new DocumentListener() {
             @Override
@@ -75,5 +76,5 @@
 
         appendName.setToolTipText(tr("Append cache name to export directory."));
-        appendName.setSelected(Main.pref.getBoolean(APPEND_NAME_PNAME));
+        appendName.setSelected(Config.getPref().getBoolean(APPEND_NAME_PNAME));
         ChangeListener appendNameChangeListener = new ChangeListener() {
             @Override
@@ -213,6 +214,6 @@
      */
     public void storePrefs() {
-        Main.pref.put(EXPORT_DIR_PNAME, exportDir.getText());
-        Main.pref.put(APPEND_NAME_PNAME, appendName.isSelected());
+        Config.getPref().put(EXPORT_DIR_PNAME, exportDir.getText());
+        Config.getPref().putBoolean(APPEND_NAME_PNAME, appendName.isSelected());
     }
 }