Don't cache searched in /publicRooms

1 files changed, 5 insertions, 1 deletions

diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py

index 3a75176ef4..37213f4bd8 100644
--- a/synapse/handlers/room_list.py
+++ b/synapse/handlers/room_list.py
@@ -41,11 +41,15 @@ class RoomListHandler(BaseHandler):
 
     def get_local_public_room_list(self, limit=None, since_token=None,
                                    search_filter=None):
+        if search_filter:
+            # We explicitly don't bother caching searches.
+            return self._get_public_room_list(limit, since_token, search_filter)
+
         result = self.response_cache.get((limit, since_token))
         if not result:
             result = self.response_cache.set(
                 (limit, since_token),
-                self._get_public_room_list(limit, since_token, search_filter)
+                self._get_public_room_list(limit, since_token)
             )
         return result