Isolate gameplay map state from the map cache. Fixes #4937.
Merge pull request #4938 from pchote/map-derp

Isolate gameplay map state from the map cache.