diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index bd314be8e6896454857ed1bbc6ca5c29ac21aa73..0dfdf91d5a0fd3cdcb34f2f341165987d54b86f8 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Proprietary and confidential.
 #-------------------------------------------------------------------------------
 
-AUX_SOURCE_DIRECTORY(./cache cache_files)
+aux_source_directory(./cache cache_files)
 
 set(vecwise_engine_src
         ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
diff --git a/cpp/src/cache/CacheMgr.cpp b/cpp/src/cache/CacheMgr.cpp
index d5e66cd7bea544795adfefc2c55fa3cf4addf6a1..df53c42510bdc8561079b77d1dbfb5ba21615318 100644
--- a/cpp/src/cache/CacheMgr.cpp
+++ b/cpp/src/cache/CacheMgr.cpp
@@ -15,15 +15,15 @@ CacheMgr::CacheMgr() {
     cache_ = std::make_shared<Cache>(16, 1UL<<32);
 }
 
-size_t CacheMgr::ItemCount() const {
+uint64_t CacheMgr::ItemCount() const {
     if(cache_ == nullptr) {
         return 0;
     }
 
-    return cache_->size();
+    return (uint64_t)(cache_->size());
 }
 
-bool CacheMgr::IsExists(const std::string& key) {
+bool CacheMgr::ItemExists(const std::string& key) {
     if(cache_ == nullptr) {
         return false;
     }
diff --git a/cpp/src/cache/CacheMgr.h b/cpp/src/cache/CacheMgr.h
index 22d461734a77ef6f30dc5faabf798fb4d642e016..759e76b9a15cc9f13274114513b502fcbfc04d0c 100644
--- a/cpp/src/cache/CacheMgr.h
+++ b/cpp/src/cache/CacheMgr.h
@@ -19,9 +19,9 @@ public:
         return mgr;
     }
 
-    size_t ItemCount() const;
+    uint64_t ItemCount() const;
 
-    bool IsExists(const std::string& key);
+    bool ItemExists(const std::string& key);
 
     DataObjPtr GetItem(const std::string& key);
 
diff --git a/cpp/unittest/cache/CMakeLists.txt b/cpp/unittest/cache/CMakeLists.txt
index eb1856ae1af75f5fd1abf43e1edbaebc0eb15e67..9a088d7c441bc7d04d4fa127b32b23be5ca2661d 100644
--- a/cpp/unittest/cache/CMakeLists.txt
+++ b/cpp/unittest/cache/CMakeLists.txt
@@ -5,9 +5,7 @@
 #-------------------------------------------------------------------------------
 include_directories(../../src)
 
-set(cache_srcs
-        ../../src/cache/Cache.cpp
-        ../../src/cache/CacheMgr.cpp)
+aux_source_directory(../../src/cache cache_srcs)
 
 set(cache_test_src
         ${unittest_srcs}
diff --git a/cpp/unittest/cache/cache_tests.cpp b/cpp/unittest/cache/cache_tests.cpp
index 3505f5aa8fd3c29cba900c3a003195fbb5cd979a..7526c1f6cda59fa21557470056b8d61d09a62d4d 100644
--- a/cpp/unittest/cache/cache_tests.cpp
+++ b/cpp/unittest/cache/cache_tests.cpp
@@ -32,7 +32,7 @@ TEST(CacheTest, CACHE_TEST) {
     cache_mgr.InsertItem(key, MAKE_100MB_DATA);
     cache::DataObjPtr data = cache_mgr.GetItem(key);
     ASSERT_TRUE(data != nullptr);
-    ASSERT_TRUE(cache_mgr.IsExists(key));
+    ASSERT_TRUE(cache_mgr.ItemExists(key));
     ASSERT_EQ(data->size(), 100*1024*1024);
 
     cache_mgr.EraseItem(key);