diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index f59d27eb06..3dd4fc6335 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -558,11 +558,6 @@ PluginManager::refresh (bool cache_only)
 	bool conceal_vst2 = false;
 #endif
 
-	if (!cache_only && !cache_valid ()) {
-		Config->set_plugin_cache_version (cache_version ());
-		Config->save_state();
-	}
-
 #ifdef AUDIOUNIT_SUPPORT
 	if (cache_only) {
 		BootMessage (_("Scanning AU Plugins"));
@@ -599,6 +594,11 @@ PluginManager::refresh (bool cache_only)
 		}
 	}
 
+	if (!cache_only && !cache_valid () && !cancelled ()) {
+		Config->set_plugin_cache_version (cache_version ());
+		Config->save_state();
+	}
+
 	BootMessage (_("Plugin Scan Complete..."));
 	_cancel_scan = false;
 	PluginScanMessage(X_("closeme"), "", false);