diff --git a/files/image_config/warmboot-finalizer/finalize-warmboot.sh b/files/image_config/warmboot-finalizer/finalize-warmboot.sh
index c4d3338dcc37..412559289026 100755
--- a/files/image_config/warmboot-finalizer/finalize-warmboot.sh
+++ b/files/image_config/warmboot-finalizer/finalize-warmboot.sh
@@ -109,14 +109,10 @@ function restore_counters_folder()
 {
     debug "Restoring counters folder after warmboot..."
 
-    modules=("portstat-0" "dropstat" "pfcstat-0" "queuestat-0" "intfstat-0")
-    for module in ${modules[@]}
-    do
-        statfile="/host/counters/$module"
-        if [[ -d $statfile ]]; then
-            mv $statfile /tmp/
-        fi
-    done
+    cache_counters_folder="/host/counters"
+    if [[ -d $cache_counters_folder ]]; then
+        mv $cache_counters_folder /tmp/cache
+    fi
 }
 
 
diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 9d8f1763736d..ee30d49cdaaf 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -178,6 +178,7 @@ start() {
         $SONIC_DB_CLI RESTAPI_DB FLUSHDB
         clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*', 'ADVERTISE_NETWORK_TABLE*', 'VXLAN_TUNNEL_TABLE*', 'MACSEC_PORT_TABLE*', 'MACSEC_INGRESS_SA_TABLE*', 'MACSEC_EGRESS_SA_TABLE*', 'MACSEC_INGRESS_SC_TABLE*', 'MACSEC_EGRESS_SC_TABLE*'"
         $SONIC_DB_CLI APPL_STATE_DB FLUSHDB
+        rm -rf /tmp/cache
     fi
 
     # On supervisor card, skip starting asic related services here. In wait(),