diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3905cb21d9b8f4bb3c55e6e5c20b34fb9ad54431..1119c8200eb4f0bb1adf6894ba08ac9c43a7b33d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-658 - Fix SQ8 Hybrid can't search
 - \#20 - C++ sdk example get grpc error 
 - \#23 - Add unittest to improve code coverage
+- \#31 - make clang-format failed after run build.sh -l
 
 ## Improvement
 - MS-552 - Add and change the easylogging library
diff --git a/core/build.sh b/core/build.sh
index 795c87c6bf38d820426910d368fb62a9e6a112aa..cd6f65201ba64bd8d2effc761d6c394efd6d7b7e 100755
--- a/core/build.sh
+++ b/core/build.sh
@@ -91,6 +91,10 @@ fi
 
 cd ${BUILD_OUTPUT_DIR}
 
+# remove make cache since build.sh -l use default variables
+# force update the variables each time
+make rebuild_cache
+
 CMAKE_CMD="cmake \
 -DBUILD_UNIT_TEST=${BUILD_UNITTEST} \
 -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}
@@ -115,7 +119,6 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then
     make lint
     if [ $? -ne 0 ]; then
         echo "ERROR! cpplint check failed"
-        rm -f CMakeCache.txt
         exit 1
     fi
     echo "cpplint check passed!"
@@ -124,7 +127,6 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then
     make check-clang-format
     if [ $? -ne 0 ]; then
         echo "ERROR! clang-format check failed"
-        rm -f CMakeCache.txt
         exit 1
     fi
     echo "clang-format check passed!"
@@ -133,12 +135,9 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then
 #    make check-clang-tidy
 #    if [ $? -ne 0 ]; then
 #        echo "ERROR! clang-tidy check failed"
-#        rm -f CMakeCache.txt
 #        exit 1
 #    fi
 #    echo "clang-tidy check passed!"
-
-    rm -f CMakeCache.txt
 else
     # compile and build
     make -j 4 || exit 1