Add caching for locations.