diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 0bd135c7..bba7923b 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -138,12 +138,6 @@ class Evaluator(object):
             ),
             self,
         )
-        # TODO remove this `if`
-        if project is not None:
-            # These imports are essential for Jedi and should therefore always
-            # be present in the module cache.
-            self.builtins_module
-            self.typing_module
 
     def import_module(self, import_names, parent_module_context=None,
                       sys_path=None, load_stub=True):
diff --git a/test/test_evaluate/test_imports.py b/test/test_evaluate/test_imports.py
index 27793c8a..76a2499b 100644
--- a/test/test_evaluate/test_imports.py
+++ b/test/test_evaluate/test_imports.py
@@ -412,12 +412,10 @@ def test_pre_defined_imports_module(Script, environment, name):
 
     path = os.path.join(root_dir, name + '.py')
     module = Script('', path=path)._get_module()
-    module_cache = module.evaluator.module_cache
     assert module.string_names == (name,)
-    m, = module_cache.get((name,))
-    assert m.py__file__() != path
-    assert m.evaluator.builtins_module.py__file__() != path
-    assert m.evaluator.typing_module.py__file__() != path
+
+    assert module.evaluator.builtins_module.py__file__() != path
+    assert module.evaluator.typing_module.py__file__() != path
 
 
 @pytest.mark.parametrize('name', ('builtins', 'typing'))