Add back the default geo of 'ROW' in the cache key creation

This will align with the service's cache key and avoid calling the service if there is a valid value in the cached.