Merge "Clear PropertyValueHolder internal caches"