Potential fix for occasional map unwanted caching issue