FORGE-1699 - Performance enhancement - faster single instance lookup (uses existing cache)