Standard use of resolvedDestinationCache Map; fixed formatting

Issue: SPR-11939