settings: use cache on whole result not just the query since it's the computation

of values that is slow not the query itself.

rhodecode/model/settings.py

@@ -23,6 +23,7 b' import logging'
 from collections import namedtuple
 from functools import wraps
 
+from rhodecode.lib import caches
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.lib.utils2 import (
     Optional, AttributeDict, safe_str, remove_prefix, str2bool)
@@ -201,14 +202,8 b' class SettingsModel(BaseModel):'
         return res
 
     def get_all_settings(self, cache=False):
+        def _compute():
         q = self._get_settings_query()
-        if cache:
-            repo = self._get_repo(self.repo) if self.repo else None
-            cache_key = (
-                "get_repo_{}_settings".format(repo.repo_id)
-                if repo else "get_hg_settings")
-            q = q.options(FromCache("sql_cache_short", cache_key))
-
         if not q:
             raise Exception('Could not get application settings !')
 
@@ -218,6 +213,20 b' class SettingsModel(BaseModel):'
         }
         return settings
 
+        if cache:
+            repo = self._get_repo(self.repo) if self.repo else None
+            namespace = 'rhodecode_settings'
+            cache_manager = caches.get_cache_manager(
+                'sql_cache_short', namespace)
+            _cache_key = (
+                "get_repo_{}_settings".format(repo.repo_id)
+                if repo else "get_app_settings")
+
+            return cache_manager.get(_cache_key, createfunc=_compute)
+
+        else:
+            return _compute()
+
     def get_auth_settings(self):
         q = self._get_settings_query()
         q = q.filter(