Merge "Enhance PropertyInvalidatedCache debugging"