Merge "Modify PropertyInvalidatedCache" into sc-dev