diff --git a/jedi/api_classes.py b/jedi/api_classes.py
index 45573f2f..af9a4737 100644
--- a/jedi/api_classes.py
+++ b/jedi/api_classes.py
@@ -3,8 +3,6 @@ The :mod:`api_classes` module contains the return classes of the API. These
 classes are the much bigger part of the whole API, because they contain the
 interesting information about completion and goto operations.
 """
-from __future__ import with_statement
-
 import warnings
 import functools
 
@@ -16,7 +14,6 @@ from jedi import cache
 from jedi.evaluate import representation as er
 from jedi.evaluate import imports
 from jedi import keywords
-import recursion
 import dynamic
 
 
@@ -27,7 +24,7 @@ def _clear_caches():
     """
     cache.clear_caches()
     dynamic.search_param_cache.clear()
-    recursion.ExecutionRecursionDecorator.reset()
+    #recursion.ExecutionRecursionDecorator.reset()
 
     evaluate.follow_statement.reset()
 
diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 8e404a41..9204482f 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -81,7 +81,7 @@ from jedi import debug
 from jedi.evaluate import representation as er
 from jedi.evaluate import builtin
 from jedi.evaluate import imports
-from jedi import recursion
+from jedi.evaluate import recursion
 from jedi import docstrings
 from jedi import dynamic
 
diff --git a/jedi/recursion.py b/jedi/evaluate/recursion.py
similarity index 100%
rename from jedi/recursion.py
rename to jedi/evaluate/recursion.py
diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py
index 069d7980..3ef1f4f1 100644
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -22,7 +22,7 @@ from jedi import debug
 from jedi import common
 from jedi.evaluate import imports
 from jedi.evaluate import builtin
-from jedi import recursion
+from jedi.evaluate import recursion
 from jedi import docstrings
 from jedi import dynamic