diff --git a/src/main/java/dev/vality/fraudbusters/resource/payment/handler/InspectorHandler.java b/src/main/java/dev/vality/fraudbusters/resource/payment/handler/InspectorHandler.java
index c57c5a45..dcc1f2eb 100644
--- a/src/main/java/dev/vality/fraudbusters/resource/payment/handler/InspectorHandler.java
+++ b/src/main/java/dev/vality/fraudbusters/resource/payment/handler/InspectorHandler.java
@@ -9,6 +9,7 @@
 import dev.vality.fraudbusters.fraud.model.PaymentModel;
 import dev.vality.fraudbusters.stream.TemplateVisitor;
 import dev.vality.fraudbusters.util.PaymentModelFactory;
+import dev.vality.fraudbusters.util.UserCacheKeyUtil;
 import dev.vality.fraudo.constant.ResultStatus;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -65,5 +66,8 @@ private static boolean isDeclineResult(CheckedResultModel result) {
                    || ResultStatus.DECLINE_AND_NOTIFY.equals(result.getResultModel().getResultStatus()));
     }
 
+    public String buildInspectUserCacheKey(InspectUserContext context) {
+        return UserCacheKeyUtil.buildInspectUserCacheKey(context);
+    }
 
 }
diff --git a/src/main/java/dev/vality/fraudbusters/util/UserCacheKeyUtil.java b/src/main/java/dev/vality/fraudbusters/util/UserCacheKeyUtil.java
index 6a540529..e6d28d98 100644
--- a/src/main/java/dev/vality/fraudbusters/util/UserCacheKeyUtil.java
+++ b/src/main/java/dev/vality/fraudbusters/util/UserCacheKeyUtil.java
@@ -1,7 +1,7 @@
 package dev.vality.fraudbusters.util;
 
-import dev.vality.damsel.proxy_inspector.InspectUserContext;
-import dev.vality.damsel.proxy_inspector.ShopContext;
+import dev.vality.damsel.fraudbusters.InspectUserContext;
+import dev.vality.damsel.fraudbusters.ShopContext;
 import dev.vality.fraudbusters.constant.ClickhouseUtilsValue;
 import org.springframework.util.StringUtils;
 
@@ -20,9 +20,9 @@ public static String buildInspectUserCacheKey(InspectUserContext context) {
             email = context.getUserInfo().isSetEmail() && StringUtils.hasLength(context.getUserInfo().getEmail())
                     ? context.getUserInfo().getEmail().toLowerCase()
                     : ClickhouseUtilsValue.UNKNOWN;
-            phone = context.getUserInfo().isSetPhoneNumber()
-                    && StringUtils.hasLength(context.getUserInfo().getPhoneNumber())
-                    ? context.getUserInfo().getPhoneNumber()
+            phone = context.getUserInfo().getPhone() != null
+                    && StringUtils.hasLength(context.getUserInfo().getPhone())
+                    ? context.getUserInfo().getPhone()
                     : ClickhouseUtilsValue.UNKNOWN;
         }
         if (context.getShopList() == null || context.getShopList().isEmpty()) {
@@ -36,11 +36,11 @@ public static String buildInspectUserCacheKey(InspectUserContext context) {
     }
 
     private static String buildShopKey(ShopContext shopContext) {
-        if (shopContext == null || shopContext.getParty() == null || shopContext.getShop() == null) {
+        if (shopContext == null || shopContext.getPartyId() == null || shopContext.getShopId() == null) {
             return ClickhouseUtilsValue.UNKNOWN;
         }
-        String partyId = shopContext.getParty().getPartyRef().getId();
-        String shopId = shopContext.getShop().getShopRef().getId();
+        String partyId = shopContext.getPartyId();
+        String shopId = shopContext.getShopId();
         return partyId + ":" + shopId;
     }
 }