Merge "Refactor PropertyInvalidatedCache locks" into tm-qpr-dev