Map and caching updates