Merge "Refactor PropertyInvalidatedCache" into main