diff --git a/HISTORY.rst b/HISTORY.rst
index 5718e304..492fd204 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -23,6 +23,7 @@ PlatformIO Core 6
 * Added validation for `project working environment names <https://docs.platformio.org/en/latest/projectconf/sections/env/index.html#working-env-name>`__ to ensure that they only contain lowercase letters ``a-z``, numbers ``0-9``, and special characters ``_`` (underscore) and ``-`` (hyphen)
 * Implemented a fix for shell injection vulnerabilities when converting INO files to CPP, ensuring your code is safe and secure (`issue #4532 <https://github.com/platformio/platformio-core/issues/4532>`_)
 * Restored the project generator for the `NetBeans IDE <https://docs.platformio.org/en/latest/integration/ide/netbeans.html>`__, providing you with more flexibility and options for your development workflow
+* Fixed an issue when "build_cache_dir" was not honored across different environments (`issue #4574 <https://github.com/platformio/platformio-core/issues/4574>`_)
 
 6.1.6 (2023-01-23)
 ~~~~~~~~~~~~~~~~~~
diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index b56dc2a2..844118ed 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -173,7 +173,8 @@ env.LoadPioPlatform()
 env.SConscriptChdir(0)
 env.SConsignFile(
     os.path.join(
-        "$BUILD_DIR", ".sconsign%d%d" % (sys.version_info[0], sys.version_info[1])
+        "$BUILD_CACHE_DIR" if env.subst("$BUILD_CACHE_DIR") else "$BUILD_DIR",
+        ".sconsign%d%d" % (sys.version_info[0], sys.version_info[1]),
     )
 )