Map caching and storing seems to work