diff --git a/usps_api_bridge.php b/usps_api_bridge.php
index 3a815d3..c880caa 100644
--- a/usps_api_bridge.php
+++ b/usps_api_bridge.php
@@ -268,16 +268,17 @@ class Usps_Api_Bridge extends Module
         // 1. Prepare the specific payload for the cache key
         // We simulate the modifications we are about to do to ensure the key is accurate
         $cachePayload = $payload;
-
+        $cachePayload['destinationEntryFacilityType'] = 'NONE';
         if ($isInternational) {
             $cachePayload['destinationCountryCode'] = Country::getIsoById($destAddress->id_country);
             $cachePayload['originZIPCode'] = $payload['originZIPCode']; // Ensure consistency
-            unset($cachePayload['destinationEntryFacilityType']);
+            //  unset($cachePayload['destinationEntryFacilityType']);
+
             unset($cachePayload['destinationZIPCode']);
             $endpointType = 'INT';
         } else {
             $cachePayload['destinationZIPCode'] = $destZip;
-            $cachePayload['destinationEntryFacilityType'] = 'NONE';
+            //    $cachePayload['destinationEntryFacilityType'] = 'NONE';
             $endpointType = 'DOM';
         }
 
@@ -384,7 +385,7 @@ class Usps_Api_Bridge extends Module
             'INT_2' => 'PRIORITY_MAIL_INTERNATIONAL',
             'INT_15' => 'FIRST-CLASS_PACKAGE_INTERNATIONAL_SERVICE',
             //'INT_4' => 'GLOBAL_EXPRESS_GUARANTEED'
-            'INT_4' => 'CLASS_PACKAGE_INTERNATIONAL_SERVICE'
+            'INT_4' => 'FIRST-CLASS_PACKAGE_INTERNATIONAL_SERVICE'
 
         ];