From 4dfa283d2ea6b300609f411c0264f9abbbc1478c Mon Sep 17 00:00:00 2001
From: Daniel Espendiller <daniel@espendiller.net>
Date: Sun, 12 Apr 2020 11:52:51 +0200
Subject: [PATCH] replace CachedValuesManager#createCachedValue usage with
 direct fetch and build result API #getCachedValue

---
 .../action/SymfonySymbolSearchAction.java     |   8 +-
 .../config/EventDispatcherSubscriberUtil.java |  16 +-
 .../config/utils/ConfigUtil.java              |  17 +-
 .../dic/container/util/DotEnvUtil.java        |  16 +-
 .../metadata/util/DoctrineMetadataUtil.java   |  19 +--
 .../symfony2plugin/routing/RouteHelper.java   |  17 +-
 .../stubs/ServiceIndexUtil.java               |  34 ++--
 .../stubs/cache/FileIndexCaches.java          |  58 +++----
 .../FilterGotoCompletionRegistrar.java        |   4 +-
 .../TwigTemplateCompletionContributor.java    |  16 +-
 .../TwigTemplateGoToDeclarationHandler.java   |   6 +-
 .../path/ConfigAddPathTwigNamespaces.java     |  32 ++--
 .../path/JsonFileIndexTwigNamespaces.java     |  26 ++-
 .../templating/util/TwigExtensionParser.java  | 157 +++++-------------
 .../templating/util/TwigUtil.java             |  27 ++-
 .../GlobalTwigConfigVariableCollector.java    |  16 +-
 .../idea/symfony2plugin/util/SymfonyUtil.java |  19 +--
 .../symfony2plugin/util/dict/ServiceUtil.java |  18 +-
 .../util/TwigExtensionParserTest.java         |  42 ++---
 19 files changed, 203 insertions(+), 345 deletions(-)

diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/SymfonySymbolSearchAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/SymfonySymbolSearchAction.java
index beffc3a1f..dba5b1af2 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/SymfonySymbolSearchAction.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/SymfonySymbolSearchAction.java
@@ -166,8 +166,7 @@ public void processNames(@NotNull Processor<String> processor, @NotNull GlobalSe
             }
 
             // Twig Extensions
-            TwigExtensionParser twigExtensionParser = new TwigExtensionParser(project);
-            for (Map<String, TwigExtension> extensionMap : Arrays.asList(twigExtensionParser.getFilters(), twigExtensionParser.getFunctions())) {
+            for (Map<String, TwigExtension> extensionMap : Arrays.asList(TwigExtensionParser.getFilters(project), TwigExtensionParser.getFunctions(project))) {
                 for(String twigFilter: extensionMap.keySet()) {
                     processor.process(twigFilter);
                 }
@@ -248,8 +247,7 @@ public void processElementsWithName(@NotNull String name, @NotNull Processor<Nav
             }
 
             // Twig Extensions
-            TwigExtensionParser twigExtensionParser = new TwigExtensionParser(project);
-            for (Map<String, TwigExtension> extensionMap : Arrays.asList(twigExtensionParser.getFilters(), twigExtensionParser.getFunctions())) {
+            for (Map<String, TwigExtension> extensionMap : Arrays.asList(TwigExtensionParser.getFilters(project), TwigExtensionParser.getFunctions(project))) {
                 for(Map.Entry<String, TwigExtension> twigFunc: extensionMap.entrySet()) {
                     if(twigFunc.getKey().equals(name)) {
                         TwigExtension twigExtension = twigFunc.getValue();
@@ -275,7 +273,7 @@ public NavigationItem[] getItemsByName(String name, String pattern, Project proj
         }
     }
 
-    class MyGotoCallback extends GotoActionBase.GotoActionCallback<FileType> {
+    static class MyGotoCallback extends GotoActionBase.GotoActionCallback<FileType> {
         @Override
         public void elementChosen(ChooseByNamePopup popup, Object element) {
             if(element instanceof NavigationItem) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/EventDispatcherSubscriberUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/EventDispatcherSubscriberUtil.java
index 711ea3f0b..0e28f9a7b 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/EventDispatcherSubscriberUtil.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/EventDispatcherSubscriberUtil.java
@@ -50,16 +50,12 @@ public class EventDispatcherSubscriberUtil {
 
     @NotNull
     public static Collection<EventDispatcherSubscribedEvent> getSubscribedEvents(final @NotNull Project project) {
-
-        CachedValue<Collection<EventDispatcherSubscribedEvent>> cache = project.getUserData(EVENT_SUBSCRIBERS);
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                CachedValueProvider.Result.create(getSubscribedEventsProxy(project), PsiModificationTracker.MODIFICATION_COUNT), false
-            );
-            project.putUserData(EVENT_SUBSCRIBERS, cache);
-        }
-
-        return cache.getValue();
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            EVENT_SUBSCRIBERS,
+            () -> CachedValueProvider.Result.create(getSubscribedEventsProxy(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java
index dba9d005d..e649023b1 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java
@@ -30,17 +30,12 @@ public class ConfigUtil {
      */
     @NotNull
     public static Map<String, Collection<String>> getTreeSignatures(@NotNull Project project) {
-        CachedValue<Map<String, Collection<String>>> cache = project.getUserData(TREE_SIGNATURE_CACHE);
-
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                    CachedValueProvider.Result.create(visitTreeSignatures(project), PsiModificationTracker.MODIFICATION_COUNT)
-                , false);
-
-            project.putUserData(TREE_SIGNATURE_CACHE, cache);
-        }
-
-        return cache.getValue();
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            TREE_SIGNATURE_CACHE,
+            () -> CachedValueProvider.Result.create(visitTreeSignatures(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java
index 25ab8431a..0f986bda6 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java
@@ -62,9 +62,10 @@ public static Collection<PsiElement> getEnvironmentVariableTargetsForParameter(@
 
     @NotNull
     public static Collection<String> getEnvironmentVariables(@NotNull Project project) {
-        CachedValue<Set<String>> cache = project.getUserData(DOT_ENV_VARIABLE_CACHE);
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() -> {
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            DOT_ENV_VARIABLE_CACHE,
+            () -> {
                 Set<String> items = new HashSet<>();
 
                 DotEnvUtil.visitEnvironment(project, pair ->
@@ -72,12 +73,9 @@ public static Collection<String> getEnvironmentVariables(@NotNull Project projec
                 );
 
                 return CachedValueProvider.Result.create(items, PsiModificationTracker.MODIFICATION_COUNT);
-                }, false
-            );
-            project.putUserData(DOT_ENV_VARIABLE_CACHE, cache);
-        }
-
-        return cache.getValue();
+            },
+            false
+        );
     }
 
     @NotNull
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java
index b1ea8f2f9..f151fea05 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java
@@ -111,10 +111,10 @@ public static Collection<VirtualFile> findMetadataForRepositoryClass(@NotNull Ph
 
     @NotNull
     public static Collection<VirtualFile> findMetadataForRepositoryClass(final @NotNull Project project, @NotNull String repositoryClass) {
-
-        CachedValue<Map<String, Collection<String>>> cache = project.getUserData(DOCTRINE_REPOSITORY_CACHE);
-        if(cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() -> {
+        Map<String, Collection<String>> cache = CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            DOCTRINE_REPOSITORY_CACHE,
+            () -> {
                 Map<String, Collection<String>> repositoryMap = new HashMap<>();
                 for (String key : FileIndexCaches.getIndexKeysCache(project, CLASS_KEYS, DoctrineMetadataFileStubIndex.KEY)) {
                     for (DoctrineModelInterface repositoryDefinition : FileBasedIndex.getInstance().getValues(DoctrineMetadataFileStubIndex.KEY, key, GlobalSearchScope.allScope(project))) {
@@ -135,19 +135,18 @@ public static Collection<VirtualFile> findMetadataForRepositoryClass(final @NotN
                 }
 
                 return CachedValueProvider.Result.create(repositoryMap, PsiModificationTracker.MODIFICATION_COUNT);
-            }, false);
-
-            project.putUserData(DOCTRINE_REPOSITORY_CACHE, cache);
-        }
+            },
+            false
+        );
 
         repositoryClass = StringUtils.stripStart(repositoryClass,"\\");
-        if(!cache.getValue().containsKey(repositoryClass)) {
+        if(!cache.containsKey(repositoryClass)) {
             return Collections.emptyList();
         }
 
         Set<VirtualFile> virtualFiles = new HashSet<>();
 
-        for (String s : cache.getValue().get(repositoryClass)) {
+        for (String s : cache.get(repositoryClass)) {
             virtualFiles.addAll(
                 FileBasedIndex.getInstance().getContainingFiles(DoctrineMetadataFileStubIndex.KEY, s, GlobalSearchScope.allScope(project))
             );
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java
index 47f591f87..e7b3bca57 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java
@@ -1045,17 +1045,12 @@ public static List<PsiElement> getRouteDefinitionTargets(Project project, String
 
     @NotNull
     synchronized public static Map<String, Route> getAllRoutes(final @NotNull Project project) {
-        CachedValue<Map<String, Route>> cache = project.getUserData(ROUTE_CACHE);
-
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                CachedValueProvider.Result.create(getAllRoutesProxy(project), PsiModificationTracker.MODIFICATION_COUNT),
-                false
-            );
-            project.putUserData(ROUTE_CACHE, cache);
-        }
-
-        return cache.getValue();
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            ROUTE_CACHE,
+            () -> CachedValueProvider.Result.create(getAllRoutesProxy(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java
index 6d4103896..cde88f9ff 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java
@@ -167,17 +167,12 @@ public static GlobalSearchScope getRestrictedFileTypesScope(@NotNull Project pro
 
     @NotNull
     public static Map<String, Collection<ContainerService>> getDecoratedServices(@NotNull Project project) {
-        CachedValue<Map<String, Collection<ContainerService>>> cache = project.getUserData(SERVICE_DECORATION_CACHE);
-
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                CachedValueProvider.Result.create(getDecoratedServicesInner(project), PsiModificationTracker.MODIFICATION_COUNT)
-            , false);
-
-            project.putUserData(SERVICE_DECORATION_CACHE, cache);
-        }
-
-        return cache.getValue();
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            SERVICE_DECORATION_CACHE,
+            () -> CachedValueProvider.Result.create(getDecoratedServicesInner(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
@@ -209,17 +204,12 @@ private static Map<String, Collection<ContainerService>> getDecoratedServicesInn
      */
     @NotNull
     public static Map<String, Collection<ContainerService>> getParentServices(@NotNull Project project) {
-        CachedValue<Map<String, Collection<ContainerService>>> cache = project.getUserData(SERVICE_PARENT);
-
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                    CachedValueProvider.Result.create(getParentServicesInner(project), PsiModificationTracker.MODIFICATION_COUNT)
-                , false);
-
-            project.putUserData(SERVICE_PARENT, cache);
-        }
-
-        return cache.getValue();
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            SERVICE_PARENT,
+            () -> CachedValueProvider.Result.create(getParentServicesInner(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     /**
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java
index 62ef1851f..b756d4e86 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java
@@ -30,26 +30,22 @@ public class FileIndexCaches {
      * @param dataHolderNames Cache extracted name Set
      */
     static public synchronized <T> Map<String, List<T>> getSetDataCache(@NotNull final Project project, @NotNull Key<CachedValue<Map<String, List<T>>>> dataHolderKey, final @NotNull Key<CachedValue<Set<String>>> dataHolderNames, @NotNull final ID<String, T> ID, @NotNull final GlobalSearchScope scope) {
-
-        CachedValue<Map<String, List<T>>> cache = project.getUserData(dataHolderKey);
-
-        if(cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() -> {
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            dataHolderKey,
+            () -> {
                 Map<String, List<T>> items = new HashMap<>();
 
                 final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance();
 
-                getIndexKeysCache(project, dataHolderNames, ID).stream().forEach(service ->
+                getIndexKeysCache(project, dataHolderNames, ID).forEach(service ->
                     items.put(service, fileBasedIndex.getValues(ID, service, scope))
                 );
 
                 return CachedValueProvider.Result.create(items, PsiModificationTracker.MODIFICATION_COUNT);
-            }, false);
-
-            project.putUserData(dataHolderKey, cache);
-        }
-
-        return cache.getValue();
+            },
+            false
+        );
     }
 
     /**
@@ -57,15 +53,14 @@ static public synchronized <T> Map<String, List<T>> getSetDataCache(@NotNull fin
      * @param dataHolderNames Cache extracted name Set
      */
     static public synchronized Map<String, List<String>> getStringDataCache(@NotNull final Project project, @NotNull Key<CachedValue<Map<String, List<String>>>> dataHolderKey, final @NotNull Key<CachedValue<Set<String>>> dataHolderNames, @NotNull final ID<String, String> ID, @NotNull final GlobalSearchScope scope) {
-
-        CachedValue<Map<String, List<String>>> cache = project.getUserData(dataHolderKey);
-        if(cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() -> {
-
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            dataHolderKey,
+            () -> {
                 Map<String, List<String>> strings = new HashMap<>();
 
                 final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance();
-                getIndexKeysCache(project, dataHolderNames, ID).stream().forEach(parameterName -> {
+                getIndexKeysCache(project, dataHolderNames, ID).forEach(parameterName -> {
                     // just for secure
                     if(parameterName == null) {
                         return;
@@ -75,30 +70,21 @@ static public synchronized Map<String, List<String>> getStringDataCache(@NotNull
                 });
 
                 return CachedValueProvider.Result.create(strings, PsiModificationTracker.MODIFICATION_COUNT);
-            }, false);
-
-            project.putUserData(dataHolderKey, cache);
-        }
-
-        return cache.getValue();
+            },
+            false
+        );
     }
 
     /**
      * There several methods that just need to check for names, as they also needed for value extraction, so cache them also
      */
     static public synchronized Set<String> getIndexKeysCache(@NotNull final Project project, @NotNull Key<CachedValue<Set<String>>> dataHolderKey, @NotNull final ID<String, ?> ID) {
-
-        CachedValue<Set<String>> cache = project.getUserData(dataHolderKey);
-
-        if(cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                CachedValueProvider.Result.create(SymfonyProcessors.createResult(project, ID), PsiModificationTracker.MODIFICATION_COUNT), false
-            );
-
-            project.putUserData(dataHolderKey, cache);
-        }
-
-        return cache.getValue();
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            dataHolderKey,
+            () -> CachedValueProvider.Result.create(SymfonyProcessors.createResult(project, ID), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java
index 7cbbc1455..efd2f956b 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java
@@ -46,7 +46,7 @@ private static class MyFilterTagGotoCompletionProvider extends GotoCompletionPro
         public Collection<LookupElement> getLookupElements() {
             Collection<LookupElement> lookupElements = new ArrayList<>();
 
-            for (Map.Entry<String, TwigExtension> extension : new TwigExtensionParser(getProject()).getFilters().entrySet()) {
+            for (Map.Entry<String, TwigExtension> extension : TwigExtensionParser.getFilters(getProject()).entrySet()) {
                 lookupElements.add(new TwigExtensionLookupElement(getProject(), extension.getKey(), extension.getValue()));
             }
 
@@ -63,7 +63,7 @@ public Collection<PsiElement> getPsiTargets(PsiElement element) {
 
             Collection<PsiElement> targets = new ArrayList<>();
 
-            for (Map.Entry<String, TwigExtension> extension : new TwigExtensionParser(getProject()).getFilters().entrySet()) {
+            for (Map.Entry<String, TwigExtension> extension : TwigExtensionParser.getFilters(getProject()).entrySet()) {
                 if(!text.equals(extension.getKey())) {
                     continue;
                 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java
index 632e10aa2..9a286a6b3 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java
@@ -179,7 +179,7 @@ private void attachLookupElements(@NotNull CompletionResultSet resultSet, Collec
                 @Override
                 protected void addCompletions(@NotNull CompletionParameters completionParameters, @NotNull ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) {
                     Project project = completionParameters.getPosition().getProject();
-                    for(Map.Entry<String, TwigExtension> entry : new TwigExtensionParser(project).getFilters().entrySet()) {
+                    for(Map.Entry<String, TwigExtension> entry : TwigExtensionParser.getFilters(project).entrySet()) {
                         completionResultSet.addElement(new TwigExtensionLookupElement(project, entry.getKey(), entry.getValue()));
                     }
                 }
@@ -191,7 +191,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters
             CompletionType.BASIC,
             TwigPattern.getCompletablePattern(),
             new CompletionProvider<CompletionParameters>() {
-                public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) {
+                public void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet resultSet) {
 
                     if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) {
                         return;
@@ -199,7 +199,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
 
                     PsiElement psiElement = parameters.getPosition().getOriginalElement();
 
-                    for(Map.Entry<String, TwigExtension> entry : new TwigExtensionParser(parameters.getPosition().getProject()).getFunctions().entrySet()) {
+                    for(Map.Entry<String, TwigExtension> entry : TwigExtensionParser.getFunctions(parameters.getPosition().getProject()).entrySet()) {
                         resultSet.addElement(new TwigExtensionLookupElement(psiElement.getProject(), entry.getKey(), entry.getValue()));
                     }
 
@@ -418,7 +418,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
             if ((prevElement != null) && ((prevElement instanceof PsiWhiteSpace))) prevElement = prevElement.getPrevSibling();
 
             if ((prevElement != null) && (prevElement.getNode().getElementType() == TwigTokenTypes.FILTER)) {
-                for(Map.Entry<String, TwigExtension> entry : new TwigExtensionParser(parameters.getPosition().getProject()).getFilters().entrySet()) {
+                for(Map.Entry<String, TwigExtension> entry : TwigExtensionParser.getFilters(parameters.getPosition().getProject()).entrySet()) {
                     resultSet.addElement(new TwigExtensionLookupElement(currElement.getProject(), entry.getKey(), entry.getValue()));
                 }
             }
@@ -466,28 +466,28 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
     }
 
     private static class TwigSimpleTestParametersCompletionProvider extends CompletionProvider<CompletionParameters> {
-        public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) {
+        public void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet resultSet) {
             PsiElement position = parameters.getPosition();
             if(!Symfony2ProjectComponent.isEnabled(position)) {
                 return;
             }
 
             Project project = position.getProject();
-            for (Map.Entry<String, TwigExtension> entry : new TwigExtensionParser(project).getSimpleTest().entrySet()) {
+            for (Map.Entry<String, TwigExtension> entry : TwigExtensionParser.getSimpleTest(project).entrySet()) {
                 resultSet.addElement(new TwigExtensionLookupElement(project, entry.getKey(), entry.getValue()));
             }
         }
     }
 
     private static class TwigOperatorCompletionProvider extends CompletionProvider<CompletionParameters> {
-        public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) {
+        public void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet resultSet) {
             PsiElement position = parameters.getPosition();
             if(!Symfony2ProjectComponent.isEnabled(position)) {
                 return;
             }
 
             Project project = position.getProject();
-            for (Map.Entry<String, TwigExtension> entry : new TwigExtensionParser(project).getOperators().entrySet()) {
+            for (Map.Entry<String, TwigExtension> entry : TwigExtensionParser.getOperators(project).entrySet()) {
                 resultSet.addElement(new TwigExtensionLookupElement(project, entry.getKey(), entry.getValue()));
             }
         }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java
index 6d9178582..dc079b6f7 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java
@@ -211,7 +211,7 @@ private Collection<PsiElement> getAfterIsToken(@NotNull PsiElement psiElement) {
 
         Collection<PsiElement> psiElements = new ArrayList<>();
 
-        for (Map.Entry<String, TwigExtension> entry : new TwigExtensionParser(psiElement.getProject()).getSimpleTest().entrySet()) {
+        for (Map.Entry<String, TwigExtension> entry : TwigExtensionParser.getSimpleTest(psiElement.getProject()).entrySet()) {
             for (String item : items) {
                 if(entry.getKey().equalsIgnoreCase(item)) {
                     psiElements.addAll(Arrays.asList(
@@ -259,7 +259,7 @@ private Collection<PsiElement> getTwigFiles(@NotNull PsiElement psiElement, int
 
     @NotNull
     private Collection<PsiElement> getFilterGoTo(@NotNull  PsiElement psiElement) {
-        Map<String, TwigExtension> filters = new TwigExtensionParser(psiElement.getProject()).getFilters();
+        Map<String, TwigExtension> filters = TwigExtensionParser.getFilters(psiElement.getProject());
 
         if(!filters.containsKey(psiElement.getText())) {
             return Collections.emptyList();
@@ -445,7 +445,7 @@ private Collection<PsiElement> getTypeGoto(@NotNull PsiElement psiElement) {
 
     @NotNull
     private Collection<PsiElement> getFunctions(@NotNull PsiElement psiElement) {
-        Map<String, TwigExtension> functions = new TwigExtensionParser(psiElement.getProject()).getFunctions();
+        Map<String, TwigExtension> functions = TwigExtensionParser.getFunctions(psiElement.getProject());
 
         String funcName = psiElement.getText();
         if(!functions.containsKey(funcName)) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/ConfigAddPathTwigNamespaces.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/ConfigAddPathTwigNamespaces.java
index 5e0b49a2c..574395094 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/ConfigAddPathTwigNamespaces.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/ConfigAddPathTwigNamespaces.java
@@ -1,5 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.templating.path;
 
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -13,6 +14,7 @@
 import fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtension;
 import fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtensionParameter;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
+import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.yaml.psi.YAMLFile;
 
@@ -36,29 +38,27 @@ public class ConfigAddPathTwigNamespaces implements TwigNamespaceExtension {
     @NotNull
     @Override
     public Collection<TwigPath> getNamespaces(@NotNull TwigNamespaceExtensionParameter parameter) {
-        CachedValue<Collection<TwigPath>> cache = parameter.getProject().getUserData(CACHE);
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(parameter.getProject()).createCachedValue(() ->
-                    CachedValueProvider.Result.create(getTwigPaths(parameter), PsiModificationTracker.MODIFICATION_COUNT),
-                false
-            );
+        Project project = parameter.getProject();
 
-            parameter.getProject().putUserData(CACHE, cache);
-        }
-
-        return cache.getValue();
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            CACHE,
+            () -> CachedValueProvider.Result.create(getTwigPaths(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
-    private Collection<TwigPath> getTwigPaths(@NotNull TwigNamespaceExtensionParameter parameter) {
+    private static Collection<TwigPath> getTwigPaths(@NotNull Project project) {
         Collection<TwigPath> twigPaths = new ArrayList<>();
 
-        for (VirtualFile file : ConfigUtil.getConfigurations(parameter.getProject(), "twig")) {
-            PsiFile psiFile = PsiManager.getInstance(parameter.getProject()).findFile(file);
-            if(!(psiFile instanceof YAMLFile)) {
-                continue;
-            }
+        // file config files a eg ".../app/..." or "../packages/..."
+        Collection<PsiFile> psiFiles = PsiElementUtils.convertVirtualFilesToPsiFiles(
+            project,
+            ConfigUtil.getConfigurations(project, "twig")
+        );
 
+        for (PsiFile psiFile : psiFiles) {
             for (Pair<String, String> stringStringPair : TwigUtil.getTwigPathFromYamlConfigResolved((YAMLFile) psiFile)) {
                 // default path
                 String first = stringStringPair.getFirst();
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java
index d1f2629aa..ae09cfa1b 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java
@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonSyntaxException;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -36,26 +37,21 @@ public class JsonFileIndexTwigNamespaces implements TwigNamespaceExtension {
     @NotNull
     @Override
     public Collection<TwigPath> getNamespaces(final @NotNull TwigNamespaceExtensionParameter parameter) {
-
-        CachedValue<Collection<TwigPath>> cache = parameter.getProject().getUserData(CACHE);
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(parameter.getProject()).createCachedValue(() ->
-                CachedValueProvider.Result.create(getNamespacesInner(parameter), PsiModificationTracker.MODIFICATION_COUNT),
-                false
-            );
-
-            parameter.getProject().putUserData(CACHE, cache);
-        }
-
-        return cache.getValue();
+        Project project = parameter.getProject();
+
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            CACHE,
+            () -> CachedValueProvider.Result.create(getNamespacesInner(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
-    private Collection<TwigPath> getNamespacesInner(@NotNull TwigNamespaceExtensionParameter parameter) {
-
+    private static Collection<TwigPath> getNamespacesInner(@NotNull Project project) {
         Collection<TwigPath> twigPaths = new ArrayList<>();
 
-        for (final PsiFile psiFile : FilenameIndex.getFilesByName(parameter.getProject(), "ide-twig.json", GlobalSearchScope.allScope(parameter.getProject()))) {
+        for (final PsiFile psiFile : FilenameIndex.getFilesByName(project, "ide-twig.json", GlobalSearchScope.allScope(project))) {
             Collection<TwigPath> cachedValue = CachedValuesManager.getCachedValue(psiFile, new MyJsonCachedValueProvider(psiFile));
             if(cachedValue != null) {
                 twigPaths.addAll(cachedValue);
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java
index 2f763b393..b87426e66 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java
@@ -35,120 +35,52 @@ public class TwigExtensionParser  {
     private static final Key<CachedValue<Map<String, TwigExtension>>> FILTERS_CACHE = new Key<>("TWIG_EXTENSIONS_FILTERS");
     private static final Key<CachedValue<Map<String, TwigExtension>>> OPERATORS_CACHE = new Key<>("TWIG_EXTENSIONS_OPERATORS");
 
-    @NotNull
-    private Project project;
-
-    private Map<String, TwigExtension> functions;
-    private Map<String, TwigExtension> simpleTest;
-    private Map<String, TwigExtension> filters;
-    private Map<String, TwigExtension> operators;
-
-    public TwigExtensionParser(@NotNull Project project) {
-        this.project = project;
+    public enum TwigExtensionType {
+        FUNCTION_METHOD, FUNCTION_NODE, SIMPLE_FUNCTION, FILTER, SIMPLE_TEST, OPERATOR
     }
 
     @NotNull
-    public Map<String, TwigExtension> getFunctions() {
-        if(functions == null) {
-            this.parseElementType(TwigElementType.METHOD);
-        }
-        return functions;
+    public static Map<String, TwigExtension> getFunctions(@NotNull Project project) {
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            FUNCTION_CACHE,
+            () -> CachedValueProvider.Result.create(parseFunctions(TwigUtil.getTwigExtensionClasses(project)), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
-    public Map<String, TwigExtension> getFilters() {
-        if(filters == null) {
-            this.parseElementType(TwigElementType.FILTER);
-        }
-        return filters;
+    public static Map<String, TwigExtension> getFilters(@NotNull Project project) {
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            FILTERS_CACHE,
+            () -> CachedValueProvider.Result.create(parseFilters(TwigUtil.getTwigExtensionClasses(project)), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
-    public Map<String, TwigExtension> getSimpleTest() {
-        if(simpleTest == null) {
-            this.parseElementType(TwigElementType.SIMPLE_TEST);
-        }
-        return simpleTest;
+    public static Map<String, TwigExtension> getSimpleTest(@NotNull Project project) {
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            TEST_CACHE,
+            () -> CachedValueProvider.Result.create(parseTests(TwigUtil.getTwigExtensionClasses(project)), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
-    public Map<String, TwigExtension> getOperators() {
-        if(operators == null) {
-            this.parseElementType(TwigElementType.OPERATOR);
-        }
-        return operators;
-    }
-
-    private enum TwigElementType {
-        FILTER, METHOD, SIMPLE_TEST, OPERATOR
-    }
-
-    public enum TwigExtensionType {
-        FUNCTION_METHOD, FUNCTION_NODE, SIMPLE_FUNCTION, FILTER, SIMPLE_TEST, OPERATOR
-    }
-
-    private void parseElementType(@NotNull TwigElementType type) {
-
-        if(type.equals(TwigElementType.FILTER)) {
-
-            CachedValue<Map<String, TwigExtension>> cache = project.getUserData(FILTERS_CACHE);
-            if(cache == null) {
-                cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                    CachedValueProvider.Result.create(parseFilters(TwigUtil.getTwigExtensionClasses(project)), PsiModificationTracker.MODIFICATION_COUNT),
-                    false
-                );
-
-                project.putUserData(FILTERS_CACHE, cache);
-            }
-
-            this.filters = cache.getValue();
-
-        } else if(type.equals(TwigElementType.METHOD)) {
-
-            CachedValue<Map<String, TwigExtension>> cache = project.getUserData(FUNCTION_CACHE);
-            if(cache == null) {
-                cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                    CachedValueProvider.Result.create(parseFunctions(TwigUtil.getTwigExtensionClasses(project)), PsiModificationTracker.MODIFICATION_COUNT),
-                    false
-                );
-
-                project.putUserData(FUNCTION_CACHE, cache);
-            }
-
-            this.functions = cache.getValue();
-
-        } else if(type.equals(TwigElementType.SIMPLE_TEST)) {
-
-            CachedValue<Map<String, TwigExtension>> cache = project.getUserData(TEST_CACHE);
-            if(cache == null) {
-                cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                    CachedValueProvider.Result.create(parseTests(TwigUtil.getTwigExtensionClasses(project)), PsiModificationTracker.MODIFICATION_COUNT),
-                    false
-                );
-
-                project.putUserData(TEST_CACHE, cache);
-            }
-
-            this.simpleTest = cache.getValue();
-
-        } else if(type.equals(TwigElementType.OPERATOR)) {
-
-            CachedValue<Map<String, TwigExtension>> cache = project.getUserData(OPERATORS_CACHE);
-            if(cache == null) {
-                cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                    CachedValueProvider.Result.create(parseOperators(TwigUtil.getTwigExtensionClasses(project)), PsiModificationTracker.MODIFICATION_COUNT),
-                    false
-                );
-
-                project.putUserData(OPERATORS_CACHE, cache);
-            }
-
-            this.operators = cache.getValue();
-        }
+    public static Map<String, TwigExtension> getOperators(@NotNull Project project) {
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            OPERATORS_CACHE,
+            () -> CachedValueProvider.Result.create(parseOperators(TwigUtil.getTwigExtensionClasses(project)), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
-    private Map<String, TwigExtension> parseFilters(@NotNull Collection<PhpClass> phpClasses) {
+    private static Map<String, TwigExtension> parseFilters(@NotNull Collection<PhpClass> phpClasses) {
         Map<String, TwigExtension> extensions = new HashMap<>();
 
         for(PhpClass phpClass : phpClasses) {
@@ -162,7 +94,7 @@ private Map<String, TwigExtension> parseFilters(@NotNull Collection<PhpClass> ph
     }
 
     @NotNull
-    private Map<String, TwigExtension> parseFunctions(@NotNull Collection<PhpClass> phpClasses) {
+    private static Map<String, TwigExtension> parseFunctions(@NotNull Collection<PhpClass> phpClasses) {
         Map<String, TwigExtension> extensions = new HashMap<>();
 
         for(PhpClass phpClass : phpClasses) {
@@ -176,7 +108,7 @@ private Map<String, TwigExtension> parseFunctions(@NotNull Collection<PhpClass>
     }
 
     @NotNull
-    private Map<String, TwigExtension> parseTests(@NotNull Collection<PhpClass> phpClasses) {
+    private static Map<String, TwigExtension> parseTests(@NotNull Collection<PhpClass> phpClasses) {
         Map<String, TwigExtension> extensions = new HashMap<>();
 
         for(PhpClass phpClass : phpClasses) {
@@ -190,7 +122,7 @@ private Map<String, TwigExtension> parseTests(@NotNull Collection<PhpClass> phpC
     }
 
     @NotNull
-    private Map<String, TwigExtension> parseOperators(@NotNull Collection<PhpClass> phpClasses) {
+    private static Map<String, TwigExtension> parseOperators(@NotNull Collection<PhpClass> phpClasses) {
         Map<String, TwigExtension> extensions = new HashMap<>();
 
         for(PhpClass phpClass : phpClasses) {
@@ -203,7 +135,7 @@ private Map<String, TwigExtension> parseOperators(@NotNull Collection<PhpClass>
         return extensions;
     }
 
-    private void parseFunctions(@NotNull Method method, @NotNull Map<String, TwigExtension> filters) {
+    private static void parseFunctions(@NotNull Method method, @NotNull Map<String, TwigExtension> filters) {
         final PhpClass containingClass = method.getContainingClass();
         if(containingClass == null) {
             return;
@@ -251,7 +183,7 @@ private static String getCallableSignature(PsiElement psiElement, Method method)
         return null;
     }
 
-    private void parseFilter(@NotNull Method method, @NotNull Map<String, TwigExtension> filters) {
+    private static void parseFilter(@NotNull Method method, @NotNull Map<String, TwigExtension> filters) {
         final PhpClass containingClass = method.getContainingClass();
         if(containingClass == null) {
             return;
@@ -260,7 +192,7 @@ private void parseFilter(@NotNull Method method, @NotNull Map<String, TwigExtens
         method.acceptChildren(new TwigFilterVisitor(method, filters, containingClass));
     }
 
-    private void parseOperators(@NotNull Method method, @NotNull Map<String, TwigExtension> filters) {
+    private static void parseOperators(@NotNull Method method, @NotNull Map<String, TwigExtension> filters) {
         final PhpClass containingClass = method.getContainingClass();
         if(containingClass == null) {
             return;
@@ -285,7 +217,11 @@ private void parseOperators(@NotNull Method method, @NotNull Map<String, TwigExt
             if(firstPsiChild instanceof ArrayCreationExpression) {
 
                 // twig core returns nested array with 2 items array creation elements
-                List<PsiElement> arrayValues = PhpPsiUtil.getChildren(firstPsiChild, new PsiElementTypCondition());
+                List<PsiElement> arrayValues = PhpPsiUtil.getChildren(
+                    firstPsiChild,
+                    psiElement -> psiElement.getNode().getElementType() == PhpElementTypes.ARRAY_VALUE
+                );
+
                 if(arrayValues.size() > 0) {
                     for (PsiElement psiElement : arrayValues) {
 
@@ -300,7 +236,7 @@ private void parseOperators(@NotNull Method method, @NotNull Map<String, TwigExt
                             for (ArrayHashElement arrayHashElement : PsiTreeUtil.findChildrenOfType(arrayValue, ArrayHashElement.class)) {
                                 PhpPsiElement key = arrayHashElement.getKey();
                                 String stringValue = PhpElementsUtil.getStringValue(key);
-                                if(stringValue != null && StringUtils.isNotBlank(stringValue)) {
+                                if(StringUtils.isNotBlank(stringValue)) {
                                     filters.put(stringValue, new TwigExtension(TwigExtensionType.OPERATOR));
                                 }
                             }
@@ -641,11 +577,4 @@ private void visitNewExpression(@NotNull NewExpression element) {
             }
         }
     }
-
-    private static class PsiElementTypCondition implements Condition<PsiElement> {
-        @Override
-        public boolean value(PsiElement psiElement) {
-            return psiElement.getNode().getElementType() == PhpElementTypes.ARRAY_VALUE;
-        }
-    }
 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java
index 0401fb947..44ebb866a 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java
@@ -912,23 +912,20 @@ public static synchronized Map<String, Set<VirtualFile>> getTemplateMap(@NotNull
         // cache twig and all files,
         // only PHP files we dont need to cache
         if(!usePhp) {
-            // cache twig files only, most use case
-            CachedValue<Map<String, Set<VirtualFile>>> cache = project.getUserData(TEMPLATE_CACHE_TWIG);
-            if (cache == null) {
-                cache = CachedValuesManager.getManager(project).createCachedValue(new MyAllTemplateFileMapCachedValueProvider(project), false);
-                project.putUserData(TEMPLATE_CACHE_TWIG, cache);
-            }
-
-            templateMapProxy = cache.getValue();
+            templateMapProxy = CachedValuesManager.getManager(project).getCachedValue(
+                project,
+                TEMPLATE_CACHE_TWIG,
+                new MyAllTemplateFileMapCachedValueProvider(project),
+                false
+            );
         } else {
             // cache all files
-            CachedValue<Map<String, Set<VirtualFile>>> cache = project.getUserData(TEMPLATE_CACHE_ALL);
-            if (cache == null) {
-                cache = CachedValuesManager.getManager(project).createCachedValue(new MyAllTemplateFileMapCachedValueProvider(project, true), false);
-                project.putUserData(TEMPLATE_CACHE_ALL, cache);
-            }
-
-            templateMapProxy = cache.getValue();
+            templateMapProxy = CachedValuesManager.getManager(project).getCachedValue(
+                project,
+                TEMPLATE_CACHE_ALL,
+                new MyAllTemplateFileMapCachedValueProvider(project, true),
+                false
+            );
         }
 
         return templateMapProxy;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java
index b334f8ed2..d12d16625 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java
@@ -42,16 +42,12 @@ public void collectPsiVariables(@NotNull TwigFileVariableCollectorParameter para
 
     @NotNull
     private Map<String, PsiVariable> getGlobals(@NotNull Project project) {
-        CachedValue<Map<String, PsiVariable>> cache = project.getUserData(CACHE);
-
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                CachedValueProvider.Result.create(getGlobalsInner(project), PsiModificationTracker.MODIFICATION_COUNT), false
-            );
-            project.putUserData(CACHE, cache);
-        }
-
-        return cache.getValue();
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            CACHE,
+            () -> CachedValueProvider.Result.create(getGlobalsInner(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyUtil.java
index c23be9492..6e9eacfd0 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyUtil.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyUtil.java
@@ -26,17 +26,14 @@ public class SymfonyUtil {
     private static final Key<CachedValue<Set<String>>> CACHE = new Key<>("SYMFONY_VERSION_CACHE");
 
     private static boolean compare(@NotNull Project project, @NotNull String version, @NotNull Comparator comparator) {
-
-        CachedValue<Set<String>> cache = project.getUserData(CACHE);
-        if (cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                CachedValueProvider.Result.create(getVersions(project), PsiModificationTracker.MODIFICATION_COUNT),
-                false
-            );
-            project.putUserData(CACHE, cache);
-        }
-
-        for (String s : cache.getValue()) {
+        Set<String> cache = CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            CACHE,
+            () -> CachedValueProvider.Result.create(getVersions(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
+
+        for (String s : cache) {
             if(comparator.accepts(s)) {
                 return true;
             }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java
index 08d00d686..5586d356b 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java
@@ -590,18 +590,12 @@ public static NavigationGutterIconBuilder<PsiElement> getLineMarkerForDecoratedS
      */
     @NotNull
     public static Collection<String> getParameterParameters(@NotNull Project project) {
-        CachedValue<Collection<String>> cache = project.getUserData(KERNEL_PARAMETER_CACHE);
-
-        if(cache == null) {
-            cache = CachedValuesManager.getManager(project).createCachedValue(() ->
-                CachedValueProvider.Result.create(getParameterParametersInner(project), PsiModificationTracker.MODIFICATION_COUNT),
-                false
-            );
-
-            project.putUserData(KERNEL_PARAMETER_CACHE, cache);
-        }
-
-        return cache.getValue();
+        return CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            KERNEL_PARAMETER_CACHE,
+            () -> CachedValueProvider.Result.create(getParameterParametersInner(project), PsiModificationTracker.MODIFICATION_COUNT),
+            false
+        );
     }
 
     @NotNull
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java
index e41875c17..32392c4b6 100644
--- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java
+++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java
@@ -19,103 +19,95 @@ public String getTestDataPath() {
     }
 
     public void testExtensionAreCollected() {
-        TwigExtensionParser extensionParser = new TwigExtensionParser(getProject());
-
         assertEquals(
             "#M#C\\Twig\\Extensions.foobar",
-            extensionParser.getFilters().get("trans").getSignature()
+            TwigExtensionParser.getFilters(getProject()).get("trans").getSignature()
         );
 
         assertEquals(
             "#Fmax",
-            extensionParser.getFunctions().get("max").getSignature()
+            TwigExtensionParser.getFunctions(getProject()).get("max").getSignature()
         );
 
         assertEquals(
             "SIMPLE_TEST",
-            extensionParser.getSimpleTest().get("my_test").getType()
+            TwigExtensionParser.getSimpleTest(getProject()).get("my_test").getType()
         );
 
         assertEquals(
             "#M#C\\My_Node_Test.compile",
-            extensionParser.getSimpleTest().get("my_test").getSignature()
+            TwigExtensionParser.getSimpleTest(getProject()).get("my_test").getSignature()
         );
 
         assertEquals(
             "#Ffoo_test",
-            extensionParser.getSimpleTest().get("my_test_2").getSignature()
+            TwigExtensionParser.getSimpleTest(getProject()).get("my_test_2").getSignature()
         );
 
         assertEquals(
             "OPERATOR",
-            extensionParser.getOperators().get("not").getType()
+            TwigExtensionParser.getOperators(getProject()).get("not").getType()
         );
 
         assertEquals(
             "OPERATOR",
-            extensionParser.getOperators().get("or").getType()
+            TwigExtensionParser.getOperators(getProject()).get("or").getType()
         );
     }
 
     public void testExtensionAreCollectedForDeprecated() {
-        TwigExtensionParser extensionParser = new TwigExtensionParser(getProject());
-
         assertEquals(
             "#M#C\\Symfony\\Bridge\\Twig\\Node\\FormEnctypeNode.compile",
-            extensionParser.getFunctions().get("form_enctype").getSignature()
+            TwigExtensionParser.getFunctions(getProject()).get("form_enctype").getSignature()
         );
 
         assertEquals(
             "#M#C\\Twig\\Extensions.foobar",
-            extensionParser.getFunctions().get("hwi_oauth_login_url").getSignature()
+            TwigExtensionParser.getFunctions(getProject()).get("hwi_oauth_login_url").getSignature()
         );
 
         assertEquals(
             "#M#C\\Twig\\Extensions.foobar",
-            extensionParser.getFilters().get("doctrine_minify_query").getSignature()
+            TwigExtensionParser.getFilters(getProject()).get("doctrine_minify_query").getSignature()
         );
 
         assertEquals(
             "#Ffoobar",
-            extensionParser.getFilters().get("localizeddate").getSignature()
+            TwigExtensionParser.getFilters(getProject()).get("localizeddate").getSignature()
         );
     }
 
     public void testExtensionAreCollectedForVersion2() {
-        TwigExtensionParser extensionParser = new TwigExtensionParser(getProject());
-
         assertEquals(
             "#M#C\\Twig\\Extensions.foobar",
-            extensionParser.getFilters().get("trans_2").getSignature()
+            TwigExtensionParser.getFilters(getProject()).get("trans_2").getSignature()
         );
 
         assertEquals(
             "#Fmax",
-            extensionParser.getFunctions().get("max_2").getSignature()
+            TwigExtensionParser.getFunctions(getProject()).get("max_2").getSignature()
         );
 
         assertEquals(
             "#Ffoo_test",
-            extensionParser.getSimpleTest().get("iterable_2").getSignature()
+            TwigExtensionParser.getSimpleTest(getProject()).get("iterable_2").getSignature()
         );
     }
 
     public void testExtensionAreCollectedForVersion3() {
-        TwigExtensionParser extensionParser = new TwigExtensionParser(getProject());
-
         assertEquals(
             "#M#C\\Twig\\Extensions.foobar",
-            extensionParser.getFilters().get("trans_3").getSignature()
+            TwigExtensionParser.getFilters(getProject()).get("trans_3").getSignature()
         );
 
         assertEquals(
             "#Fmax",
-            extensionParser.getFunctions().get("max_3").getSignature()
+            TwigExtensionParser.getFunctions(getProject()).get("max_3").getSignature()
         );
 
         assertEquals(
             "#Ffoo_test",
-            extensionParser.getSimpleTest().get("iterable_3").getSignature()
+            TwigExtensionParser.getSimpleTest(getProject()).get("iterable_3").getSignature()
         );
     }
 }