diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 1b89dc6274dd..9982ae0fedf7 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -574,7 +574,7 @@ def _get_interested_parties(self, states, calculate_remote_hosts=True):
                 if not local_states:
                     continue
 
-                users = yield self.state.get_current_user_in_room(room_id)
+                users = yield self.store.get_users_in_room(room_id)
                 hosts = set(get_domain_from_id(u) for u in users)
 
                 for host in hosts:
@@ -766,7 +766,7 @@ def user_joined_room(self, user, room_id):
         # don't need to send to local clients here, as that is done as part
         # of the event stream/sync.
         # TODO: Only send to servers not already in the room.
-        user_ids = yield self.state.get_current_user_in_room(room_id)
+        user_ids = yield self.store.get_users_in_room(room_id)
         if self.is_mine(user):
             state = yield self.current_state_for_user(user.to_string())
 
@@ -1069,7 +1069,7 @@ def get_new_events(self, user, from_key, room_ids=None, include_offline=True,
 
                 user_ids_to_check = set()
                 for room_id in room_ids:
-                    users = yield self.state.get_current_user_in_room(room_id)
+                    users = yield self.store.get_users_in_room(room_id)
                     user_ids_to_check.update(users)
 
                 user_ids_to_check.update(friends)
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 8712d7e18c24..6685b9da1c37 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -564,9 +564,13 @@ def _persist_events_txn(self, txn, events_and_contexts, backfilled,
                 )
 
                 for member in members_changed:
-                    txn.call_after(self.get_rooms_for_user.invalidate, (member,))
+                    self._invalidate_cache_and_stream(
+                        txn, self.get_rooms_for_user, (member,)
+                    )
 
-                txn.call_after(self.get_users_in_room.invalidate, (room_id,))
+                self._invalidate_cache_and_stream(
+                    txn, self.get_users_in_room, (room_id,)
+                )
 
                 # Add an entry to the current_state_resets table to record the point
                 # where we clobbered the current state