SONAR-926 Optimize resource lookup using deprecated key