Try to avoid CachedMetaClass for modules

jedi/evaluate/context/module.py

@@ -5,8 +5,7 @@ import os
 
 from parso import python_bytes_to_unicode
 
-from jedi._compatibility import use_metaclass
-from jedi.evaluate.cache import CachedMetaClass, evaluator_method_cache
+from jedi.evaluate.cache import evaluator_method_cache
 from jedi.evaluate.filters import GlobalNameFilter, ContextNameMixin, \
     AbstractNameDefinition, ParserTreeFilter, DictFilter
 from jedi.evaluate import compiled
@@ -41,7 +40,7 @@ class ModuleName(ContextNameMixin, AbstractNameDefinition):
         return self._name
 
 
-class ModuleContext(use_metaclass(CachedMetaClass, TreeContext)):
+class ModuleContext(TreeContext):
     api_type = u'module'
     parent_context = None
 

jedi/evaluate/imports.py

@@ -46,6 +46,9 @@ class ModuleCache(object):
     def get(self, name):
         return self._name_cache[name]
 
+    def get_from_path(self, path):
+        return self._path_cache[path]
+
 
 # This memoization is needed, because otherwise we will infinitely loop on
 # certain imports.
@@ -468,6 +471,15 @@ class Importer(object):
 
 def _load_module(evaluator, path=None, code=None, sys_path=None,
                  parent_module=None, module_name=None, safe_module_name=False):
+    try:
+        return evaluator.module_cache.get(module_name)
+    except KeyError:
+        pass
+    try:
+        return evaluator.module_cache.get_from_path(path)
+    except KeyError:
+        pass
+
     if isinstance(path, ImplicitNSInfo):
         from jedi.evaluate.context.namespace import ImplicitNamespaceContext
         module = ImplicitNamespaceContext(