diff --git a/synapse/state.py b/synapse/state.py
index f8b18a4a2d..02fee47f39 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -179,7 +179,7 @@ class StateHandler(object):
     def get_current_hosts_in_room(self, room_id, latest_event_ids=None):
         if not latest_event_ids:
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
-        logger.debug("calling resolve_state_groups from get_current_user_in_room")
+        logger.debug("calling resolve_state_groups from get_current_hosts_in_room")
         entry = yield self.resolve_state_groups(room_id, latest_event_ids)
         joined_hosts = yield self.store.get_joined_hosts(
             room_id, entry.state_id, entry.state
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 1c0fa8a680..c571da2ce4 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -494,7 +494,7 @@ class RoomMemberStore(SQLBaseStore):
             room_id, state_group, state_ids
         )
 
-    @cachedInlineCallbacks(num_args=3)
+    @cachedInlineCallbacks(num_args=2)
     def _get_joined_hosts(self, room_id, state_group, current_state_ids):
         # We don't use `state_group`, its there so that we can cache based
         # on it. However, its important that its never None, since two current_state's