Change room caching to make it timeout really quickly.  Mitigates #1047 as all caches reflect the truth after ~1s.
Merge pull request #1117 from JabbR/mitigate-room-cache

Mitigate issues with room cache and scaleout
Merge remote-tracking branch 'upstream/dev' into dev