diff --git a/src/main/java/com/avanza/astrix/intellij/AstrixContextGetterInspector.java b/src/main/java/com/avanza/astrix/intellij/AstrixContextGetterInspector.java
index 2d66e90..b3e5a9e 100644
--- a/src/main/java/com/avanza/astrix/intellij/AstrixContextGetterInspector.java
+++ b/src/main/java/com/avanza/astrix/intellij/AstrixContextGetterInspector.java
@@ -42,7 +42,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) {
 
             PsiMethod method = expression.resolveMethod();
             if (isAstrixBeanRetriever(method) && !hasBeanDeclaration(expression.getArgumentList())) {
-                problemsHolder.registerProblem(expression.getArgumentList().getExpressions()[0], "No astrix bean declaration found.", GENERIC_ERROR_OR_WARNING);
+                problemsHolder.registerProblem(expression.getArgumentList(), "No astrix bean declaration found.", GENERIC_ERROR_OR_WARNING);
             }
         }
 
diff --git a/src/main/java/com/avanza/astrix/intellij/AstrixContextUtility.java b/src/main/java/com/avanza/astrix/intellij/AstrixContextUtility.java
index 19eed5f..7594db4 100644
--- a/src/main/java/com/avanza/astrix/intellij/AstrixContextUtility.java
+++ b/src/main/java/com/avanza/astrix/intellij/AstrixContextUtility.java
@@ -12,15 +12,13 @@
 import com.intellij.util.Query;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Predicate;
-import java.util.stream.Stream;
 
 import static com.intellij.psi.PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME;
+import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableSet;
 import static java.util.stream.Collectors.toList;
 
 public class AstrixContextUtility {
@@ -30,6 +28,7 @@ public class AstrixContextUtility {
     private static final String SERVICE_FQN = "com.avanza.astrix.provider.core.Service";
     private static final String QUALIFIER_FQN = "com.avanza.astrix.provider.core.AstrixQualifier";
     private static final String API_PROVIDER_FQN = "com.avanza.astrix.provider.core.AstrixApiProvider";
+    private static final Set<String> BEAN_RETRIEVAL_METHOD_NAMES = unmodifiableSet(new TreeSet<>(asList("getBean", "waitForBean")));
 
     public static boolean isAstrixBeanRetriever(@Nullable PsiMethod method) {
         if(method == null) {
@@ -38,8 +37,7 @@ public static boolean isAstrixBeanRetriever(@Nullable PsiMethod method) {
 
         String qualifiedClassName = Optional.ofNullable(method.getContainingClass()).map(PsiClass::getQualifiedName).orElse(null);
         String methodName = method.getName();
-        return ASTRIX_FQN.equals(qualifiedClassName) &&
-                ("getBean".equals(methodName) || "waitForBean".equals(methodName));
+        return ASTRIX_FQN.equals(qualifiedClassName) && BEAN_RETRIEVAL_METHOD_NAMES.contains(methodName);
     }
 
     public static boolean isBeanDeclaration(PsiMethod method) {
@@ -113,10 +111,8 @@ public static Collection<Query<PsiMethodCallExpression>> findBeanUsages(PsiMetho
         if (astrixInterface == null) {
             return emptyList();
         }
-        PsiMethod[] getBeanMethods = astrixInterface.findMethodsByName("getBean", true);
-        PsiMethod[] waitForBeanMethods = astrixInterface.findMethodsByName("waitForBean", true);
 
-        return Stream.concat(Arrays.stream(getBeanMethods), Arrays.stream(waitForBeanMethods))
+        return BEAN_RETRIEVAL_METHOD_NAMES.stream().flatMap(methodName -> Arrays.stream(astrixInterface.findMethodsByName(methodName, true)))
                      .map(psiMethod -> MethodReferencesSearch.search(psiMethod, searchScope, true))
                      .map(query -> new QueryChain<>(query).instanceOf(PsiReferenceExpression.class)
                                                           .map(PsiReferenceExpression::getContext)