cachedLocation now moved to property