diff --git a/changelog.d/1.misc b/changelog.d/1.misc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py
index 4afefc6b1d..13ac6307db 100644
--- a/synapse/state/__init__.py
+++ b/synapse/state/__init__.py
@@ -131,10 +131,13 @@ class StateHandler(object):
         if not latest_event_ids:
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
 
+        logger.info("latest events in %s: %s", room_id, latest_event_ids)
         logger.debug("calling resolve_state_groups from get_current_state")
         ret = yield self.resolve_state_groups_for_events(room_id, latest_event_ids)
         state = ret.state
 
+        logger.info("state at %s: %s", latest_event_ids, state)
+
         if event_type:
             event_id = state.get((event_type, state_key))
             event = None
@@ -380,6 +383,8 @@ class StateHandler(object):
             room_id, event_ids
         )
 
+        logger.info("state groups at %s: %s", event_ids, state_groups_ids)
+
         if len(state_groups_ids) == 0:
             return _StateCacheEntry(state={}, state_group=None)
         elif len(state_groups_ids) == 1:
diff --git a/synapse/storage/data_stores/main/events.py b/synapse/storage/data_stores/main/events.py
index e71c23541d..a3ad22a56c 100644
--- a/synapse/storage/data_stores/main/events.py
+++ b/synapse/storage/data_stores/main/events.py
@@ -647,7 +647,12 @@ class EventsStore(
             self.db.simple_delete_txn(
                 txn, table="event_forward_extremities", keyvalues={"room_id": room_id}
             )
-            txn.call_after(self.get_latest_event_ids_in_room.invalidate, (room_id,))
+
+            def inv(*args):
+                logger.info("Invalidating get_latest_event_ids: %r", *args)
+                self.get_latest_event_ids_in_room.invalidate(*args)
+
+            txn.call_after(inv, (room_id,))
 
         self.db.simple_insert_many_txn(
             txn,
@@ -658,6 +663,7 @@ class EventsStore(
                 for ev_id in new_extrem
             ],
         )
+        logger.info("new forward extremities: %s", new_forward_extremities)
         # We now insert into stream_ordering_to_exterm a mapping from room_id,
         # new stream_ordering to new forward extremeties in the room.
         # This allows us to later efficiently look up the forward extremeties