Added caching of LocationService lookups