Merge "Update the owners of PropertyInvalidatedCache" into main