diff --git a/src/entity_manager/configuration.cpp b/src/entity_manager/configuration.cpp
index 9463133..7532fc1 100644
--- a/src/entity_manager/configuration.cpp
+++ b/src/entity_manager/configuration.cpp
@@ -181,6 +181,11 @@
 
 bool writeJsonFiles(const nlohmann::json& systemConfiguration)
 {
+    if (!EM_CACHE_CONFIGURATION)
+    {
+        return true;
+    }
+
     std::filesystem::create_directory(configurationOutDir);
     std::ofstream output(currentConfiguration);
     if (!output.good())
diff --git a/src/entity_manager/entity_manager.cpp b/src/entity_manager/entity_manager.cpp
index 3835cc1..1511662 100644
--- a/src/entity_manager/entity_manager.cpp
+++ b/src/entity_manager/entity_manager.cpp
@@ -566,7 +566,7 @@
 
 void EntityManager::handleCurrentConfigurationJson()
 {
-    if (em_utils::fwVersionIsSame())
+    if (EM_CACHE_CONFIGURATION && em_utils::fwVersionIsSame())
     {
         if (std::filesystem::is_regular_file(currentConfiguration))
         {
diff --git a/src/entity_manager/log_device_inventory.cpp b/src/entity_manager/log_device_inventory.cpp
index 02a888d..5a8a918 100644
--- a/src/entity_manager/log_device_inventory.cpp
+++ b/src/entity_manager/log_device_inventory.cpp
@@ -9,6 +9,10 @@
 
 void logDeviceAdded(const nlohmann::json& record)
 {
+    if (!EM_CACHE_CONFIGURATION)
+    {
+        return;
+    }
     if (!deviceHasLogging(record))
     {
         return;
diff --git a/src/entity_manager/meson.build b/src/entity_manager/meson.build
index 0ea941a..1fe9b08 100644
--- a/src/entity_manager/meson.build
+++ b/src/entity_manager/meson.build
@@ -6,6 +6,9 @@
     cpp_args_em += ['-DENABLE_RUNTIME_VALIDATE_JSON=false']
 endif
 
+allowed = get_option('new-device-detection')
+cpp_args_em += '-DEM_CACHE_CONFIGURATION=' + allowed.to_string()
+
 em_deps = [boost, nlohmann_json_dep, phosphor_logging_dep, sdbusplus, valijson]
 
 entity_manager_lib = static_library(