diff --git a/src/main/java/li/strolch/runtime/agent/CachedElementMapHandler.java b/src/main/java/li/strolch/runtime/agent/CachedElementMapHandler.java
index 8a2c9b854..1a5b204ab 100644
--- a/src/main/java/li/strolch/runtime/agent/CachedElementMapHandler.java
+++ b/src/main/java/li/strolch/runtime/agent/CachedElementMapHandler.java
@@ -55,7 +55,7 @@ public class CachedElementMapHandler extends InMemoryElementMapHandler {
 			PersistenceHandler persistenceHandler = getContainer().getComponent(PersistenceHandler.class);
 			try (StrolchTransaction tx = persistenceHandler.openTx(realm)) {
 
-				ResourceDao resourceDao = persistenceHandler.getResourceDao(tx);
+				ResourceDao resourceDao = tx.getResourceDao();
 				Set<String> resourceTypes = resourceDao.queryTypes();
 				for (String type : resourceTypes) {
 					List<Resource> resources = resourceDao.queryAll(type);
@@ -65,7 +65,7 @@ public class CachedElementMapHandler extends InMemoryElementMapHandler {
 					}
 				}
 
-				OrderDao orderDao = persistenceHandler.getOrderDao(tx);
+				OrderDao orderDao = tx.getOrderDao();
 				Set<String> orderTypes = orderDao.queryTypes();
 				for (String type : orderTypes) {
 					List<Order> orders = orderDao.queryAll(type);