Replaced the DeepTrimCachingNormalizerComparator for uniqueMemberMatch by a ?ameAndOptionalUidComparator. Created a caching comparator for this one, but we can't use it straight as we don't inject the AttributeType registry into the normalizer if it's cached.
Changed paths: