Merge "property_contexts: add location cache"