diff --git a/platypush/entities/_engine.py b/platypush/entities/_engine.py
index 88090e3b1..cc0236388 100644
--- a/platypush/entities/_engine.py
+++ b/platypush/entities/_engine.py
@@ -8,7 +8,7 @@ from typing import Iterable, List, Optional
 from sqlalchemy import and_, or_
 from sqlalchemy.orm import Session, make_transient
 
-from platypush.context import get_bus
+from platypush.context import get_bus, get_plugin
 from platypush.message.event.entities import EntityUpdateEvent
 
 from ._base import Entity, db_url
@@ -32,12 +32,10 @@ class EntitiesEngine(Thread):
             'by_name_and_plugin': {},
         }
 
-    def _get_db(self):
-        from platypush.context import get_plugin
-
+    def _get_session(self):
         db = get_plugin('db')
         assert db
-        return db
+        return db.get_session(engine=db_url)
 
     def _get_cached_entity(self, entity: Entity) -> Optional[dict]:
         if entity.id:
@@ -98,7 +96,7 @@ class EntitiesEngine(Thread):
                 self._cache_entities(new_entity)
 
     def _init_entities_cache(self):
-        with self._get_db().get_session(engine=db_url) as session:
+        with self._get_session() as session:
             entities = session.query(Entity).all()
             for entity in entities:
                 make_transient(entity)
@@ -249,7 +247,7 @@ class EntitiesEngine(Thread):
         return list(new_entities.values())
 
     def _process_entities(self, *entities: Entity):
-        with self._get_db().get_session(engine=db_url) as session:
+        with self._get_session() as session:
             # Ensure that the internal IDs are set to null before the merge
             for e in entities:
                 e.id = None  # type: ignore