Isolate gameplay map state from the map cache.

Fixes #4937.