location caching fix 3