diff --git a/lib/galaxy/app.py b/lib/galaxy/app.py
index 55fc3ffe261..6bdba337d35 100644
--- a/lib/galaxy/app.py
+++ b/lib/galaxy/app.py
@@ -22,7 +22,7 @@ from galaxy.webhooks import WebhooksRegistry
 from galaxy.sample_tracking import external_service_types
 from galaxy.openid.providers import OpenIDProviders
 from galaxy.tools.data_manager.manager import DataManagers
-from galaxy.tools.toolbox.cache import (
+from galaxy.tools.cache import (
     ToolCache,
     ToolShedRepositoryCache
 )
diff --git a/lib/galaxy/tools/toolbox/cache.py b/lib/galaxy/tools/cache.py
similarity index 100%
rename from lib/galaxy/tools/toolbox/cache.py
rename to lib/galaxy/tools/cache.py
diff --git a/test/unit/tools/test_toolbox.py b/test/unit/tools/test_toolbox.py
index 0dfb4edd70a..6a64976ff5e 100644
--- a/test/unit/tools/test_toolbox.py
+++ b/test/unit/tools/test_toolbox.py
@@ -11,7 +11,7 @@ from galaxy import model
 from galaxy.model import tool_shed_install
 from galaxy.model.tool_shed_install import mapping
 from galaxy.tools import ToolBox
-from galaxy.tools.toolbox.cache import ToolCache
+from galaxy.tools.cache import ToolCache
 from galaxy.tools.toolbox.lineages.tool_shed import ToolVersionCache
 from galaxy.tools.toolbox.watcher import get_tool_conf_watcher
 from galaxy.webapps.galaxy.config_watchers import ConfigWatchers