diff --git a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalRouteChangeHandler.java b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalRouteChangeHandler.java
index 508ba880..63a1ed10 100644
--- a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalRouteChangeHandler.java
+++ b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalRouteChangeHandler.java
@@ -50,7 +50,7 @@ public void handle(TimestampedChange timestampedChange, MachineEvent event) {
         var timeRange = TimeUtil.getTimeRange(event.getCreatedAt());
         final Withdrawal withdrawalOld =
                 Optional.ofNullable(withdrawalDao.get(withdrawalId, timeRange.getLeft(), timeRange.getRight()))
-                        .orElse(withdrawalDao.get(withdrawalId));
+                        .orElseGet(() -> withdrawalDao.get(withdrawalId));
         Withdrawal withdrawalNew = machineEventCopyFactory
                 .create(event, sequenceId, withdrawalId, withdrawalOld, timestampedChange.getOccuredAt());
 
diff --git a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalStatusChangedHandler.java b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalStatusChangedHandler.java
index 623c3870..cee02225 100644
--- a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalStatusChangedHandler.java
+++ b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalStatusChangedHandler.java
@@ -54,7 +54,7 @@ public void handle(TimestampedChange timestampedChange, MachineEvent event) {
         var timeRange = TimeUtil.getTimeRange(event.getCreatedAt());
         final Withdrawal withdrawalOld =
                 Optional.ofNullable(withdrawalDao.get(withdrawalId, timeRange.getLeft(), timeRange.getRight()))
-                        .orElse(withdrawalDao.get(withdrawalId));
+                        .orElseGet(() -> withdrawalDao.get(withdrawalId));
         Withdrawal withdrawalNew = machineEventCopyFactory
                 .create(event, sequenceId, withdrawalId, withdrawalOld, timestampedChange.getOccuredAt());
 
diff --git a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalTransferCreatedHandler.java b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalTransferCreatedHandler.java
index 3976d687..e14d7c9c 100644
--- a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalTransferCreatedHandler.java
+++ b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalTransferCreatedHandler.java
@@ -52,7 +52,7 @@ public void handle(TimestampedChange timestampedChange, MachineEvent event) {
         var timeRange = TimeUtil.getTimeRange(event.getCreatedAt());
         final Withdrawal withdrawalOld =
                 Optional.ofNullable(withdrawalDao.get(withdrawalId, timeRange.getLeft(), timeRange.getRight()))
-                        .orElse(withdrawalDao.get(withdrawalId));
+                        .orElseGet(() -> withdrawalDao.get(withdrawalId));
         Withdrawal withdrawalNew = machineEventCopyFactory
                 .create(event, sequenceId, withdrawalId, withdrawalOld, timestampedChange.getOccuredAt());
 
diff --git a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalTransferStatusChangedHandler.java b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalTransferStatusChangedHandler.java
index 86bd2066..cd8d7138 100644
--- a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalTransferStatusChangedHandler.java
+++ b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/WithdrawalTransferStatusChangedHandler.java
@@ -53,7 +53,7 @@ public void handle(TimestampedChange timestampedChange, MachineEvent event) {
         var timeRange = TimeUtil.getTimeRange(event.getCreatedAt());
         final Withdrawal withdrawalOld =
                 Optional.ofNullable(withdrawalDao.get(withdrawalId, timeRange.getLeft(), timeRange.getRight()))
-                        .orElse(withdrawalDao.get(withdrawalId));
+                        .orElseGet(() -> withdrawalDao.get(withdrawalId));
         Withdrawal withdrawalNew = machineEventCopyFactory
                 .create(event, sequenceId, withdrawalId, withdrawalOld, timestampedChange.getOccuredAt());
         withdrawalNew.setWithdrawalTransferStatus(TBaseUtil.unionFieldToEnum(status, WithdrawalTransferStatus.class));
diff --git a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionFinishedHandler.java b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionFinishedHandler.java
index 51316406..c329d08f 100644
--- a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionFinishedHandler.java
+++ b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionFinishedHandler.java
@@ -48,7 +48,7 @@ public void handle(TimestampedChange timestampedChange, MachineEvent event) {
         var timeRange = TimeUtil.getTimeRange(event.getCreatedAt());
         final WithdrawalSession withdrawalSessionOld = Optional
                 .ofNullable(withdrawalSessionDao.get(withdrawalSessionId, timeRange.getLeft(), timeRange.getRight()))
-                .orElse(withdrawalSessionDao.get(withdrawalSessionId));
+                .orElseGet(() -> withdrawalSessionDao.get(withdrawalSessionId));
         WithdrawalSession withdrawalSessionNew = withdrawalSessionMachineEventCopyFactory
                 .create(event, sequenceId, withdrawalSessionId, withdrawalSessionOld, timestampedChange.getOccuredAt());
 
diff --git a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionNextStateHandler.java b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionNextStateHandler.java
index 0b0c3b9b..52398575 100644
--- a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionNextStateHandler.java
+++ b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionNextStateHandler.java
@@ -45,7 +45,7 @@ public void handle(TimestampedChange timestampedChange, MachineEvent event) {
         var timeRange = TimeUtil.getTimeRange(event.getCreatedAt());
         final WithdrawalSession withdrawalSessionOld = Optional
                 .ofNullable(withdrawalSessionDao.get(withdrawalSessionId, timeRange.getLeft(), timeRange.getRight()))
-                .orElse(withdrawalSessionDao.get(withdrawalSessionId));
+                .orElseGet(() -> withdrawalSessionDao.get(withdrawalSessionId));
         WithdrawalSession withdrawalSessionNew = withdrawalSessionMachineEventCopyFactory
                 .create(event, sequenceId, withdrawalSessionId, withdrawalSessionOld, timestampedChange.getOccuredAt());
         withdrawalSessionNew.setAdapterState(JsonUtil.thriftBaseToJsonString(change.getNextState()));
diff --git a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionTransactionBoundHandler.java b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionTransactionBoundHandler.java
index ad241320..6afde7ab 100644
--- a/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionTransactionBoundHandler.java
+++ b/src/main/java/dev/vality/daway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionTransactionBoundHandler.java
@@ -49,7 +49,7 @@ public void handle(TimestampedChange timestampedChange, MachineEvent event) {
         var timeRange = TimeUtil.getTimeRange(event.getCreatedAt());
         final WithdrawalSession withdrawalSessionOld = Optional
                 .ofNullable(withdrawalSessionDao.get(withdrawalSessionId, timeRange.getLeft(), timeRange.getRight()))
-                .orElse(withdrawalSessionDao.get(withdrawalSessionId));
+                .orElseGet(() -> withdrawalSessionDao.get(withdrawalSessionId));
         WithdrawalSession withdrawalSessionNew = withdrawalSessionMachineEventCopyFactory
                 .create(event, sequenceId, withdrawalSessionId, withdrawalSessionOld, timestampedChange.getOccuredAt());