Fix bug with map key caching
Merge pull request #653 from xzyfer/feat/maps-speed-boost

Fix bug with map key caching