diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index 27fe99a93ec..e3140e6fb8b 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -926,7 +926,7 @@ void CacheDictionary::update(UpdateUnitPtr & update_unit_ptr) const
                     else
                         cell.setExpiresAt(std::chrono::time_point<std::chrono::system_clock>::max());
 
-                    update_unit_ptr->getPresentIdHandler()(id, cell_idx);
+                    update_unit_ptr->callPresentIdHandler(id, cell_idx);
                     /// mark corresponding id as found
                     remaining_ids[id] = 1;
                 }
@@ -988,9 +988,9 @@ void CacheDictionary::update(UpdateUnitPtr & update_unit_ptr) const
                 if (was_default)
                     cell.setDefault();
                 if (was_default)
-                    update_unit_ptr->getAbsentIdHandler()(id, cell_idx);
+                    update_unit_ptr->callAbsentIdHandler(id, cell_idx);
                 else
-                    update_unit_ptr->getPresentIdHandler()(id, cell_idx);
+                    update_unit_ptr->callPresentIdHandler(id, cell_idx);
                 continue;
             }
             /// We don't have expired data for that `id` so all we can do is to rethrow `last_exception`.
@@ -1022,7 +1022,7 @@ void CacheDictionary::update(UpdateUnitPtr & update_unit_ptr) const
             setDefaultAttributeValue(attribute, cell_idx);
 
         /// inform caller that the cell has not been found
-        update_unit_ptr->getAbsentIdHandler()(id, cell_idx);
+        update_unit_ptr->callAbsentIdHandler(id, cell_idx);
     }
 
     ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedMiss, not_found_num);
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index 5e7e272ff2e..ee4229b3249 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -399,16 +399,18 @@ private:
                 absent_id_handler([](Key, size_t){}){}
 
 
-        PresentIdHandler getPresentIdHandler()
+        void callPresentIdHandler(Key key, size_t cell_idx)
         {
             std::lock_guard lock(callback_mutex);
-            return can_use_callback ? present_id_handler : PresentIdHandler{};
+            if (can_use_callback)
+                present_id_handler(key, cell_idx);
         }
 
-        AbsentIdHandler getAbsentIdHandler()
+        void callAbsentIdHandler(Key key, size_t cell_idx)
         {
             std::lock_guard lock(callback_mutex);
-            return can_use_callback ? absent_id_handler : AbsentIdHandler{};
+            if (can_use_callback)
+                absent_id_handler(key, cell_idx);
         }
 
         std::vector<Key> requested_ids;
diff --git a/src/Dictionaries/CacheDictionary.inc.h b/src/Dictionaries/CacheDictionary.inc.h
index 27064d113e6..8867d6a3c4a 100644
--- a/src/Dictionaries/CacheDictionary.inc.h
+++ b/src/Dictionaries/CacheDictionary.inc.h
@@ -148,7 +148,9 @@ void CacheDictionary::getItemsNumberImpl(
             std::begin(cache_expired_ids), std::end(cache_expired_ids),
             std::back_inserter(required_ids), [](auto & pair) { return pair.first; });
 
-    auto on_cell_updated = [&] (const auto id, const auto cell_idx)
+    auto on_cell_updated =
+    [&attribute_array, &cache_not_found_ids, &cache_expired_ids, &out]
+    (const auto id, const auto cell_idx)
     {
         const auto attribute_value = attribute_array[cell_idx];