Added caching for geocoding