diff --git a/components/spi_flash/spi_flash_os_func_noos.c b/components/spi_flash/spi_flash_os_func_noos.c
index b912460c42..32b3b4726c 100644
--- a/components/spi_flash/spi_flash_os_func_noos.c
+++ b/components/spi_flash/spi_flash_os_func_noos.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,59 +8,21 @@
 #include "sdkconfig.h"
 #include "esp_flash.h"
 #include "esp_attr.h"
-
 #include "esp_rom_sys.h"
-#if CONFIG_IDF_TARGET_ESP32
-#include "esp32/rom/cache.h"
-#elif CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/rom/cache.h"
-#elif CONFIG_IDF_TARGET_ESP32S3
-#include "esp32s3/rom/ets_sys.h"
-#include "esp32s3/rom/cache.h"
-#elif CONFIG_IDF_TARGET_ESP32C3
-#include "esp32c3/rom/ets_sys.h"
-#include "esp32c3/rom/cache.h"
-#elif CONFIG_IDF_TARGET_ESP32C2
-#include "esp32c2/rom/ets_sys.h"
-#include "esp32c2/rom/cache.h"
-#elif CONFIG_IDF_TARGET_ESP32C6
-#include "esp32c6/rom/ets_sys.h"
-#include "esp32c6/rom/cache.h"
-#elif CONFIG_IDF_TARGET_ESP32H2
-#include "esp32h2/rom/ets_sys.h"
-#include "esp32h2/rom/cache.h"
-#endif
-
-#include "esp_attr.h"
-
-#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
-typedef struct {
-    uint32_t icache_autoload;
-    uint32_t dcache_autoload;
-} spi_noos_arg_t;
-
-static DRAM_ATTR spi_noos_arg_t spi_arg = { 0 };
-#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2
-typedef struct {
-    uint32_t icache_autoload;
-} spi_noos_arg_t;
-
-static DRAM_ATTR spi_noos_arg_t spi_arg = { 0 };
-#endif
+#include "rom/cache.h"
+#include "hal/cache_hal.h"
+#include "hal/cache_ll.h"
+#include "soc/soc_caps.h"
 
 static IRAM_ATTR esp_err_t start(void *arg)
 {
 #if CONFIG_IDF_TARGET_ESP32
     Cache_Read_Disable(0);
     Cache_Read_Disable(1);
-#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
-    spi_noos_arg_t *spi_arg = arg;
-    spi_arg->icache_autoload = Cache_Suspend_ICache();
-    spi_arg->dcache_autoload = Cache_Suspend_DCache();
-#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2
-    spi_noos_arg_t *spi_arg = arg;
-    spi_arg->icache_autoload = Cache_Suspend_ICache();
+#else
+    cache_hal_suspend(CACHE_TYPE_ALL);
 #endif
+
     return ESP_OK;
 }
 
@@ -69,16 +31,10 @@ static IRAM_ATTR esp_err_t end(void *arg)
 #if CONFIG_IDF_TARGET_ESP32
     Cache_Read_Enable(0);
     Cache_Read_Enable(1);
-#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
-    spi_noos_arg_t *spi_arg = arg;
-    Cache_Invalidate_ICache_All();
-    Cache_Resume_ICache(spi_arg->icache_autoload);
-    Cache_Resume_DCache(spi_arg->dcache_autoload);
-#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2
-    spi_noos_arg_t *spi_arg = arg;
-    Cache_Invalidate_ICache_All();
-    Cache_Resume_ICache(spi_arg->icache_autoload);
+#else
+    cache_hal_resume(CACHE_TYPE_ALL);
 #endif
+
     return ESP_OK;
 }
 
@@ -110,9 +66,5 @@ esp_err_t IRAM_ATTR esp_flash_app_disable_os_functions(esp_flash_t* chip)
 {
     chip->os_func = &esp_flash_noos_functions;
 
-#if !CONFIG_IDF_TARGET_ESP32
-    chip->os_func_data = &spi_arg;
-#endif
-
     return ESP_OK;
 }