diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py
index f4d7a9d9..ce59f6d6 100644
--- a/src/octoprint/server/util/flask.py
+++ b/src/octoprint/server/util/flask.py
@@ -313,7 +313,7 @@ class LessSimpleCache(BaseCache):
 
 _cache = LessSimpleCache()
 
-def cached(timeout=5 * 60, key=lambda: "view/%s" % flask.request.path, unless=None, refreshif=None, unless_response=None):
+def cached(timeout=5 * 60, key=lambda: "view:%s" % flask.request.path, unless=None, refreshif=None, unless_response=None):
 	def decorator(f):
 		@functools.wraps(f)
 		def decorated_function(*args, **kwargs):
@@ -339,7 +339,7 @@ def cached(timeout=5 * 60, key=lambda: "view/%s" % flask.request.path, unless=No
 					return rv
 
 			# get value from wrapped function
-			logger.debug("No cache entry or refreshing cache for {path}, calling wrapped function".format(path=flask.request.path))
+			logger.debug("No cache entry or refreshing cache for {path} (key: {key}), calling wrapped function".format(path=flask.request.path, key=cache_key))
 			rv = f(*args, **kwargs)
 
 			# do not store if the "unless_response" condition is true
diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py
index 17927536..3399a740 100644
--- a/src/octoprint/server/views.py
+++ b/src/octoprint/server/views.py
@@ -29,7 +29,7 @@ _valid_div_re = re.compile("[a-zA-Z_-]+")
 @app.route("/")
 @util.flask.cached(timeout=-1,
                    refreshif=lambda: util.flask.cache_check_headers() or "_refresh" in request.values,
-                   key=lambda: "view/%s/%s" % (request.path, g.locale),
+                   key=lambda: "view:{}:{}".format(request.base_url, g.locale),
                    unless_response=util.flask.cache_check_response_headers)
 def index():
 
@@ -404,7 +404,7 @@ def robotsTxt():
 @app.route("/i18n/<string:locale>/<string:domain>.js")
 @util.flask.cached(timeout=-1,
                    refreshif=lambda: util.flask.cache_check_headers() or "_refresh" in request.values,
-                   key=lambda: "view/%s/%s" % (request.path, g.locale))
+                   key=lambda: "view:{}:{}".format(request.base_url, g.locale))
 def localeJs(locale, domain):
 	messages = dict()
 	plural_expr = None