don't update access

2 files changed, 7 insertions, 2 deletions

diff --git a/synapse/util/caches/dictionary_cache.py b/synapse/util/caches/dictionary_cache.py
index 810b8bb716..4e5a96b5b4 100644
--- a/synapse/util/caches/dictionary_cache.py
+++ b/synapse/util/caches/dictionary_cache.py
@@ -165,7 +165,10 @@ class DictionaryCache(Generic[KT, DKT, DV]):
             return DictionaryEntry(False, known_absent, values)
 
         entry = self.cache.get(
-            (key, _FullCacheKey.KEY), _Sentinel.sentinel, update_metrics=False
+            (key, _FullCacheKey.KEY),
+            _Sentinel.sentinel,
+            update_metrics=False,
+            update_last_access=False,
         )
         if entry is _Sentinel.sentinel:
             return DictionaryEntry(False, known_absent, values)
diff --git a/synapse/util/caches/lrucache.py b/synapse/util/caches/lrucache.py
index b2b999cd60..aab0d1c7e2 100644
--- a/synapse/util/caches/lrucache.py
+++ b/synapse/util/caches/lrucache.py
@@ -559,10 +559,12 @@ class LruCache(Generic[KT, VT]):
             default: Optional[T] = None,
             callbacks: Collection[Callable[[], None]] = (),
             update_metrics: bool = True,
+            update_last_access: bool = True,
         ) -> Union[None, T, VT]:
             node = cache.get(key, None)
             if node is not None:
-                move_node_to_front(node)
+                if update_last_access:
+                    move_node_to_front(node)
                 node.add_callbacks(callbacks)
                 if update_metrics and metrics:
                     metrics.inc_hits()