diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index e63aab6cc..8dce89073 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -391,7 +391,7 @@ class RoomMemberStore(SQLBaseStore):
         )
 
     @cachedInlineCallbacks(num_args=2, cache_context=True, iterable=True,
-                           max_entries=2000)
+                           max_entries=50000)
     def _get_joined_users_from_context(self, room_id, state_group, current_state_ids,
                                        cache_context, event=None):
         # We don't use `state_group`, it's there so that we can cache based
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index c480743f8..fe942ecad 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -284,7 +284,7 @@ class StateStore(SQLBaseStore):
             return [r[0] for r in results]
         return self.runInteraction("get_current_state_for_key", f)
 
-    @cached(num_args=2, max_entries=1000, iterable=True)
+    @cached(num_args=2, max_entries=50000, iterable=True)
     def _get_state_group_from_group(self, group, types):
         raise NotImplementedError()