diff --git a/goblin/session.py b/goblin/session.py
index ddcae329618eab10d585f0512a5850667bb37639..05551b278c42b37f64122841ac658b985c8d663e 100644
--- a/goblin/session.py
+++ b/goblin/session.py
@@ -59,27 +59,27 @@ def bindprop(element_class, ogm_name, val, *, binding=None):
     return db_name, val
 
 
-class TraversalResponse:
-    """Asynchronous iterator that encapsulates a traversal response queue"""
-    def __init__(self, response_queue):
-        self._queue = response_queue
-        self._done = False
-
-    async def __aiter__(self):
-        return self
-
-    async def __anext__(self):
-        if self._done:
-            return
-        msg = await self.fetch_data()
-        if msg:
-            return msg
-        else:
-            self._done = True
-            raise StopAsyncIteration
-
-    async def fetch_data(self):
-        return await self._queue.get()
+# class TraversalResponse:
+#     """Asynchronous iterator that encapsulates a traversal response queue"""
+#     def __init__(self, response_queue):
+#         self._queue = response_queue
+#         self._done = False
+#
+#     async def __aiter__(self):
+#         return self
+#
+#     async def __anext__(self):
+#         if self._done:
+#             return
+#         msg = await self.fetch_data()
+#         if msg:
+#             return msg
+#         else:
+#             self._done = True
+#             raise StopAsyncIteration
+#
+#     async def fetch_data(self):
+#         return await self._queue.get()
 
 
 class Session:
@@ -227,6 +227,7 @@ class Session:
                         current.target = GenericVertex()
                 element = current.__mapping__.mapper_func(
                     obj, props, current)
+                self.current[hashable_id] = element
                 return Traverser(element, bulk)
             else:
                 return result