Merge "Add property-invalidated cache"