diff --git a/olp-cpp-sdk-core/CMakeLists.txt b/olp-cpp-sdk-core/CMakeLists.txt
index aac162670..1835cb53a 100644
--- a/olp-cpp-sdk-core/CMakeLists.txt
+++ b/olp-cpp-sdk-core/CMakeLists.txt
@@ -255,7 +255,6 @@ set(OLP_SDK_CACHE_SOURCES
     ./src/cache/DiskCacheSizeLimitEnv.h
     ./src/cache/DiskCacheSizeLimitWritableFile.cpp
     ./src/cache/DiskCacheSizeLimitWritableFile.h
-    ./src/cache/KeyGenerator.cpp
     ./src/cache/ProtectedKeyList.cpp
     ./src/cache/ProtectedKeyList.h
     ./src/cache/InMemoryCache.cpp
@@ -264,6 +263,11 @@ set(OLP_SDK_CACHE_SOURCES
     ./src/cache/ReadOnlyEnv.h
 )
 
+# Separately since it is used outside of cache
+set(OLP_SDK_KEY_GENERATOR_SOURCES
+    ./src/cache/KeyGenerator.cpp
+)
+
 set(OLP_SDK_CLIENT_SOURCES
     ./src/client/api/PlatformApi.cpp
     ./src/client/api/PlatformApi.h
@@ -409,6 +413,7 @@ set(OLP_SDK_CORE_SOURCES
     ${OLP_SDK_LOGGING_SOURCES}
     ${OLP_SDK_THREAD_SOURCES}
     ${OLP_SDK_GEO_SOURCES}
+    ${OLP_SDK_KEY_GENERATOR_SOURCES}
 )
 
 if(OLP_SDK_ENABLE_DEFAULT_CACHE)