Merge "BUG-1796: implement SourceIdentifier/PotentialSchemaSource caching"