Minor changes to caching to make it freak out less often
Particularly, it works better on gigantic maps at the furthest-out zoom level.