diff --git a/jedi/evaluate/compiled/__init__.py b/jedi/evaluate/compiled/__init__.py
index 2aca8edc..9ea7decf 100644
--- a/jedi/evaluate/compiled/__init__.py
+++ b/jedi/evaluate/compiled/__init__.py
@@ -505,7 +505,7 @@ def get_special_object(evaluator, identifier):
 def compiled_objects_cache(func):
     def wrapper(evaluator, obj, parent=None, module=None):
         # Do a very cheap form of caching here.
-        if parent is None and obj != _builtins:
+        if parent is None and not inspect.ismodule(obj):
             parent = create(evaluator, _builtins)
 
         key = id(obj), id(parent), id(module)
diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py
index 9cd60a0a..fd7240df 100644
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -464,7 +464,7 @@ class Class(use_metaclass(CachedMetaClass, Wrapper)):
         return self._evaluator.find_types(self, name)
 
     def py__class__(self, evaluator):
-        return compiled.create(evaluator, 'type')
+        return compiled.create(evaluator, type)
 
     @property
     def params(self):