diff --git a/sycl/source/detail/global_handler.cpp b/sycl/source/detail/global_handler.cpp
index d49ec1d028ee1..8c672589f7f59 100644
--- a/sycl/source/detail/global_handler.cpp
+++ b/sycl/source/detail/global_handler.cpp
@@ -254,12 +254,10 @@ ThreadPool &GlobalHandler::getHostTaskThreadPool() {
 }
 
 KernelNameBasedCacheT *GlobalHandler::createKernelNameBasedCache() {
-  static std::vector<std::unique_ptr<KernelNameBasedCacheT>>
-      &KernelNameBasedCaches = getOrCreate(MKernelNameBasedCaches);
+  static std::deque<KernelNameBasedCacheT> &KernelNameBasedCaches =
+      getOrCreate(MKernelNameBasedCaches);
   LockGuard LG{MKernelNameBasedCaches.Lock};
-  return KernelNameBasedCaches
-      .emplace_back(std::make_unique<KernelNameBasedCacheT>())
-      .get();
+  return &KernelNameBasedCaches.emplace_back();
 }
 
 void GlobalHandler::releaseDefaultContexts() {
diff --git a/sycl/source/detail/global_handler.hpp b/sycl/source/detail/global_handler.hpp
index ba1756a716ae8..8c66f5a8dcd8d 100644
--- a/sycl/source/detail/global_handler.hpp
+++ b/sycl/source/detail/global_handler.hpp
@@ -11,6 +11,7 @@
 #include <sycl/detail/spinlock.hpp>
 #include <sycl/detail/util.hpp>
 
+#include <deque>
 #include <memory>
 #include <unordered_map>
 
@@ -130,8 +131,7 @@ class GlobalHandler {
   InstWithLock<XPTIRegistry> MXPTIRegistry;
   // Thread pool for host task and event callbacks execution
   InstWithLock<ThreadPool> MHostTaskThreadPool;
-  InstWithLock<std::vector<std::unique_ptr<KernelNameBasedCacheT>>>
-      MKernelNameBasedCaches;
+  InstWithLock<std::deque<KernelNameBasedCacheT>> MKernelNameBasedCaches;
 };
 } // namespace detail
 } // namespace _V1