Added caching to map view