location caching fix