avoid matching instances of different classes to same key

1 job for !38 with 99-view-model-provider in 1 minute and 53 seconds (queued for 6 seconds)
latest merge request