Merge "Enhance PropertyInvalidatedCache debug"