Fixed Map not loading from cache bug