bugfix for location caching