diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef7149dfec7..2b2ab544508 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,18 +6,20 @@
 - New `EXECUTION_HALTED` error returned if there is an error executing or simulating a transaction, with the reason for execution being halted. Replaces the generic `INTERNAL_ERROR` return code in certain cases which some applications may be checking for [#6343](https://github.com/hyperledger/besu/pull/6343)
 - The Besu Docker images with `openjdk-latest` tags since 23.10.3 were incorrectly using UID 1001 instead of 1000 for the container's `besu` user. The user now uses 1000 again. Containers created from or migrated to images using UID 1001 will need to chown their persistent database files to UID 1000 [#6360](https://github.com/hyperledger/besu/pull/6360)
 - The deprecated `--privacy-onchain-groups-enabled` option has now been removed. Use the `--privacy-flexible-groups-enabled` option instead. [#6411](https://github.com/hyperledger/besu/pull/6411)
+- The time that can be spent selecting transactions during block creation is not capped at 5 seconds for PoS and PoW networks, and for PoA networks, at 75% of the block period specified in the genesis, this to prevent possible DoS in case a single transaction is taking too long to execute, and to have a stable block production rate, but it could be a breaking change if an existing network used to have transactions that takes more time to executed that the newly introduced limit, if it is mandatory for these network to keep processing these long processing transaction, then the default value of `block-txs-selection-max-time` or `poa-block-txs-selection-max-time` needs to be tuned accordingly. 
 
 ### Deprecations
 
 ### Additions and Improvements
 - Optimize RocksDB WAL files, allows for faster restart and a more linear disk space utilization [#6328](https://github.com/hyperledger/besu/pull/6328)
 - Disable transaction handling when the node is not in sync, to avoid unnecessary transaction validation work [#6302](https://github.com/hyperledger/besu/pull/6302)
-- Introduce TransactionEvaluationContext to pass data between transaction selectors and plugin, during block creation [#6381](https://github.com/hyperledger/besu/pull/6381) 
+- Introduce TransactionEvaluationContext to pass data between transaction selectors and plugin, during block creation [#6381](https://github.com/hyperledger/besu/pull/6381)
 - Upgrade dependencies [#6377](https://github.com/hyperledger/besu/pull/6377)
-- Upgrade `com.fasterxml.jackson` dependencies [#6378](https://github.com/hyperledger/besu/pull/6378) 
+- Upgrade `com.fasterxml.jackson` dependencies [#6378](https://github.com/hyperledger/besu/pull/6378)
 - Upgrade Guava dependency [#6396](https://github.com/hyperledger/besu/pull/6396)
 - Upgrade Mockito [#6397](https://github.com/hyperledger/besu/pull/6397)
 - Upgrade `tech.pegasys.discovery:discovery` [#6414](https://github.com/hyperledger/besu/pull/6414)
+- Options to tune the max allowed time that can be spent selecting transactions during block creation are now stable [#6423](https://github.com/hyperledger/besu/pull/6423)
 
 ### Bug fixes
 - INTERNAL_ERROR from `eth_estimateGas` JSON/RPC calls [#6344](https://github.com/hyperledger/besu/issues/6344)
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
index c51d03d4305..7f276c704c4 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -2907,17 +2907,15 @@ private MiningParameters getMiningParameters() {
           ImmutableMiningParameters.builder().from(miningOptions.toDomainObject());
       final var actualGenesisOptions = getActualGenesisConfigOptions();
       if (actualGenesisOptions.isPoa()) {
-        miningParametersBuilder.unstable(
-            ImmutableMiningParameters.Unstable.builder()
-                .minBlockTime(getMinBlockTime(actualGenesisOptions))
-                .build());
+        miningParametersBuilder.genesisBlockPeriodSeconds(
+            getGenesisBlockPeriodSeconds(actualGenesisOptions));
       }
       miningParameters = miningParametersBuilder.build();
     }
     return miningParameters;
   }
 
-  private int getMinBlockTime(final GenesisConfigOptions genesisConfigOptions) {
+  private int getGenesisBlockPeriodSeconds(final GenesisConfigOptions genesisConfigOptions) {
     if (genesisConfigOptions.isClique()) {
       return genesisConfigOptions.getCliqueConfigOptions().getBlockPeriodSeconds();
     }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/converter/PositiveNumberConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/PositiveNumberConverter.java
new file mode 100644
index 00000000000..2b45f35ffe5
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/PositiveNumberConverter.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.converter;
+
+import org.hyperledger.besu.cli.converter.exception.PercentageConversionException;
+import org.hyperledger.besu.util.number.PositiveNumber;
+
+import picocli.CommandLine;
+
+/** The PositiveNumber Cli type converter. */
+public class PositiveNumberConverter implements CommandLine.ITypeConverter<PositiveNumber> {
+
+  @Override
+  public PositiveNumber convert(final String value) throws PercentageConversionException {
+    try {
+      return PositiveNumber.fromString(value);
+    } catch (NullPointerException | IllegalArgumentException e) {
+      throw new PercentageConversionException(value);
+    }
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PositiveNumberConversionException.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PositiveNumberConversionException.java
new file mode 100644
index 00000000000..c9f0d9e934b
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PositiveNumberConversionException.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.converter.exception;
+
+import static java.lang.String.format;
+
+/** The custom PositiveNumber conversion exception. */
+public final class PositiveNumberConversionException extends Exception {
+
+  /**
+   * Instantiates a new PositiveNumber conversion exception.
+   *
+   * @param value the invalid value to add in exception message
+   */
+  public PositiveNumberConversionException(final String value) {
+    super(format("Invalid value: %s, should be a positive number >0.", value));
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/MiningOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/MiningOptions.java
index 78e2032e4f6..55197b8e826 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/MiningOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/MiningOptions.java
@@ -16,20 +16,20 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.MutableInitValues.DEFAULT_EXTRA_DATA;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.MutableInitValues.DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.MutableInitValues.DEFAULT_MIN_PRIORITY_FEE_PER_GAS;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.MutableInitValues.DEFAULT_MIN_TRANSACTION_GAS_PRICE;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_MAX_OMMERS_DEPTH;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POS_BLOCK_CREATION_MAX_TIME;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POS_BLOCK_CREATION_REPETITION_MIN_DURATION;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POW_JOB_TTL;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_REMOTE_SEALERS_LIMIT;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_REMOTE_SEALERS_TTL;
 
-import org.hyperledger.besu.cli.converter.PercentageConverter;
+import org.hyperledger.besu.cli.converter.PositiveNumberConverter;
 import org.hyperledger.besu.cli.util.CommandLineUtils;
 import org.hyperledger.besu.config.GenesisConfigOptions;
 import org.hyperledger.besu.datatypes.Address;
@@ -37,7 +37,7 @@
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters.MutableInitValues;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.util.number.Percentage;
+import org.hyperledger.besu.util.number.PositiveNumber;
 
 import java.util.List;
 
@@ -115,6 +115,24 @@ public class MiningOptions implements CLIOptions<MiningParameters> {
               + " If set, each block's gas limit will approach this setting over time.")
   private Long targetGasLimit = null;
 
+  @Option(
+      names = {"--block-txs-selection-max-time"},
+      converter = PositiveNumberConverter.class,
+      description =
+          "Specifies the maximum time, in milliseconds, that could be spent selecting transactions to be included in the block."
+              + " Not compatible with PoA networks, see poa-block-txs-selection-max-time. (default: ${DEFAULT-VALUE})")
+  private PositiveNumber nonPoaBlockTxsSelectionMaxTime =
+      DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
+
+  @Option(
+      names = {"--poa-block-txs-selection-max-time"},
+      converter = PositiveNumberConverter.class,
+      description =
+          "Specifies the maximum time that could be spent selecting transactions to be included in the block, as a percentage of the fixed block time of the PoA network."
+              + " To be only used on PoA networks, for other networks see block-txs-selection-max-time."
+              + " (default: ${DEFAULT-VALUE})")
+  private PositiveNumber poaBlockTxsSelectionMaxTime = DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME;
+
   @CommandLine.ArgGroup(validate = false)
   private final Unstable unstableOptions = new Unstable();
 
@@ -168,25 +186,6 @@ static class Unstable {
                 + " then it waits before next repetition. Must be positive and ≤ 2000 (default: ${DEFAULT-VALUE} milliseconds)")
     private Long posBlockCreationRepetitionMinDuration =
         DEFAULT_POS_BLOCK_CREATION_REPETITION_MIN_DURATION;
-
-    @CommandLine.Option(
-        hidden = true,
-        names = {"--Xblock-txs-selection-max-time"},
-        description =
-            "Specifies the maximum time, in milliseconds, that could be spent selecting transactions to be included in the block."
-                + " Not compatible with PoA networks, see Xpoa-block-txs-selection-max-time."
-                + " Must be positive and ≤ (default: ${DEFAULT-VALUE})")
-    private Long nonPoaBlockTxsSelectionMaxTime = DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
-
-    @CommandLine.Option(
-        hidden = true,
-        names = {"--Xpoa-block-txs-selection-max-time"},
-        converter = PercentageConverter.class,
-        description =
-            "Specifies the maximum time that could be spent selecting transactions to be included in the block, as a percentage of the fixed block time of the PoA network."
-                + " To be only used on PoA networks, for other networks see Xblock-txs-selection-max-time."
-                + " (default: ${DEFAULT-VALUE})")
-    private Percentage poaBlockTxsSelectionMaxTime = DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME;
   }
 
   private MiningOptions() {}
@@ -270,26 +269,17 @@ public void validate(
     if (genesisConfigOptions.isPoa()) {
       CommandLineUtils.failIfOptionDoesntMeetRequirement(
           commandLine,
-          "--Xblock-txs-selection-max-time can't be used with PoA networks,"
-              + " see Xpoa-block-txs-selection-max-time instead",
+          "--block-txs-selection-max-time can't be used with PoA networks,"
+              + " see poa-block-txs-selection-max-time instead",
           false,
-          singletonList("--Xblock-txs-selection-max-time"));
+          singletonList("--block-txs-selection-max-time"));
     } else {
       CommandLineUtils.failIfOptionDoesntMeetRequirement(
           commandLine,
-          "--Xpoa-block-txs-selection-max-time can be only used with PoA networks,"
-              + " see --Xblock-txs-selection-max-time instead",
+          "--poa-block-txs-selection-max-time can be only used with PoA networks,"
+              + " see --block-txs-selection-max-time instead",
           false,
-          singletonList("--Xpoa-block-txs-selection-max-time"));
-
-      if (unstableOptions.nonPoaBlockTxsSelectionMaxTime <= 0
-          || unstableOptions.nonPoaBlockTxsSelectionMaxTime
-              > DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME) {
-        throw new ParameterException(
-            commandLine,
-            "--Xblock-txs-selection-max-time must be positive and ≤ "
-                + DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME);
-      }
+          singletonList("--poa-block-txs-selection-max-time"));
     }
   }
 
@@ -303,6 +293,10 @@ static MiningOptions fromConfig(final MiningParameters miningParameters) {
     miningOptions.minTransactionGasPrice = miningParameters.getMinTransactionGasPrice();
     miningOptions.minPriorityFeePerGas = miningParameters.getMinPriorityFeePerGas();
     miningOptions.minBlockOccupancyRatio = miningParameters.getMinBlockOccupancyRatio();
+    miningOptions.nonPoaBlockTxsSelectionMaxTime =
+        miningParameters.getNonPoaBlockTxsSelectionMaxTime();
+    miningOptions.poaBlockTxsSelectionMaxTime = miningParameters.getPoaBlockTxsSelectionMaxTime();
+
     miningOptions.unstableOptions.remoteSealersLimit =
         miningParameters.getUnstable().getRemoteSealersLimit();
     miningOptions.unstableOptions.remoteSealersTimeToLive =
@@ -317,10 +311,6 @@ static MiningOptions fromConfig(final MiningParameters miningParameters) {
         miningParameters.getUnstable().getPosBlockCreationMaxTime();
     miningOptions.unstableOptions.posBlockCreationRepetitionMinDuration =
         miningParameters.getUnstable().getPosBlockCreationRepetitionMinDuration();
-    miningOptions.unstableOptions.nonPoaBlockTxsSelectionMaxTime =
-        miningParameters.getUnstable().getBlockTxsSelectionMaxTime();
-    miningOptions.unstableOptions.poaBlockTxsSelectionMaxTime =
-        miningParameters.getUnstable().getPoaBlockTxsSelectionMaxTime();
 
     miningParameters.getCoinbase().ifPresent(coinbase -> miningOptions.coinbase = coinbase);
     miningParameters.getTargetGasLimit().ifPresent(tgl -> miningOptions.targetGasLimit = tgl);
@@ -350,6 +340,8 @@ public MiningParameters toDomainObject() {
             .isStratumMiningEnabled(iStratumMiningEnabled)
             .stratumNetworkInterface(stratumNetworkInterface)
             .stratumPort(stratumPort)
+            .nonPoaBlockTxsSelectionMaxTime(nonPoaBlockTxsSelectionMaxTime)
+            .poaBlockTxsSelectionMaxTime(poaBlockTxsSelectionMaxTime)
             .unstable(
                 ImmutableMiningParameters.Unstable.builder()
                     .remoteSealersLimit(unstableOptions.remoteSealersLimit)
@@ -360,8 +352,6 @@ public MiningParameters toDomainObject() {
                     .posBlockCreationMaxTime(unstableOptions.posBlockCreationMaxTime)
                     .posBlockCreationRepetitionMinDuration(
                         unstableOptions.posBlockCreationRepetitionMinDuration)
-                    .nonPoaBlockTxsSelectionMaxTime(unstableOptions.nonPoaBlockTxsSelectionMaxTime)
-                    .poaBlockTxsSelectionMaxTime(unstableOptions.poaBlockTxsSelectionMaxTime)
                     .build());
 
     return miningParametersBuilder.build();
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
index 6bcfea3cad8..f2d3fce981a 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
@@ -591,7 +591,9 @@ public BesuController build() {
     prepForBuild();
 
     final ProtocolSchedule protocolSchedule = createProtocolSchedule();
-    final GenesisState genesisState = GenesisState.fromConfig(genesisConfig, protocolSchedule);
+    final GenesisState genesisState =
+        GenesisState.fromConfig(
+            dataStorageConfiguration.getDataStorageFormat(), genesisConfig, protocolSchedule);
 
     final VariablesStorage variablesStorage = storageProvider.createVariablesStorage();
 
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
index 26296556302..04d9f015530 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -95,6 +95,7 @@
 import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;
 import org.hyperledger.besu.util.number.Fraction;
 import org.hyperledger.besu.util.number.Percentage;
+import org.hyperledger.besu.util.number.PositiveNumber;
 import org.hyperledger.besu.util.platform.PlatformDetector;
 
 import java.io.File;
@@ -846,6 +847,8 @@ public void tomlThatConfiguresEverythingExceptPermissioningToml() throws IOExcep
         tomlResult.getDouble(tomlKey);
       } else if (Percentage.class.isAssignableFrom(optionSpec.type())) {
         tomlResult.getLong(tomlKey);
+      } else if (PositiveNumber.class.isAssignableFrom(optionSpec.type())) {
+        tomlResult.getLong(tomlKey);
       } else {
         tomlResult.getString(tomlKey);
       }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/MiningOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/MiningOptionsTest.java
index 404c021e3b9..4b1fdddb53a 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/MiningOptionsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/MiningOptionsTest.java
@@ -15,8 +15,8 @@
 package org.hyperledger.besu.cli.options;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POS_BLOCK_CREATION_MAX_TIME;
 import static org.mockito.Mockito.atMost;
 import static org.mockito.Mockito.verify;
@@ -28,7 +28,7 @@
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters.MutableInitValues;
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters.Unstable;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.util.number.Percentage;
+import org.hyperledger.besu.util.number.PositiveNumber;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -315,35 +315,26 @@ public void posBlockCreationMaxTimeOutOfAllowedRange() {
   public void blockTxsSelectionMaxTimeDefaultValue() {
     internalTestSuccess(
         miningParams ->
-            assertThat(miningParams.getUnstable().getBlockTxsSelectionMaxTime())
+            assertThat(miningParams.getNonPoaBlockTxsSelectionMaxTime())
                 .isEqualTo(DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME));
   }
 
   @Test
   public void blockTxsSelectionMaxTimeOption() {
     internalTestSuccess(
-        miningParams ->
-            assertThat(miningParams.getUnstable().getBlockTxsSelectionMaxTime()).isEqualTo(1700L),
-        "--Xblock-txs-selection-max-time",
+        miningParams -> assertThat(miningParams.getBlockTxsSelectionMaxTime()).isEqualTo(1700L),
+        "--block-txs-selection-max-time",
         "1700");
   }
 
-  @Test
-  public void blockTxsSelectionMaxTimeOutOfAllowedRange() {
-    internalTestFailure(
-        "--Xblock-txs-selection-max-time must be positive and ≤ 5000",
-        "--Xblock-txs-selection-max-time",
-        "6000");
-  }
-
   @Test
   public void blockTxsSelectionMaxTimeIncompatibleWithPoaNetworks() throws IOException {
     final Path genesisFileIBFT2 = createFakeGenesisFile(VALID_GENESIS_IBFT2_POST_LONDON);
     internalTestFailure(
-        "--Xblock-txs-selection-max-time can't be used with PoA networks, see Xpoa-block-txs-selection-max-time instead",
+        "--block-txs-selection-max-time can't be used with PoA networks, see poa-block-txs-selection-max-time instead",
         "--genesis-file",
         genesisFileIBFT2.toString(),
-        "--Xblock-txs-selection-max-time",
+        "--block-txs-selection-max-time",
         "2");
   }
 
@@ -351,7 +342,7 @@ public void blockTxsSelectionMaxTimeIncompatibleWithPoaNetworks() throws IOExcep
   public void poaBlockTxsSelectionMaxTimeDefaultValue() {
     internalTestSuccess(
         miningParams ->
-            assertThat(miningParams.getUnstable().getPoaBlockTxsSelectionMaxTime())
+            assertThat(miningParams.getPoaBlockTxsSelectionMaxTime())
                 .isEqualTo(DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME));
   }
 
@@ -360,27 +351,32 @@ public void poaBlockTxsSelectionMaxTimeOption() throws IOException {
     final Path genesisFileIBFT2 = createFakeGenesisFile(VALID_GENESIS_IBFT2_POST_LONDON);
     internalTestSuccess(
         miningParams ->
-            assertThat(miningParams.getUnstable().getPoaBlockTxsSelectionMaxTime())
-                .isEqualTo(Percentage.fromInt(80)),
+            assertThat(miningParams.getPoaBlockTxsSelectionMaxTime())
+                .isEqualTo(PositiveNumber.fromInt(80)),
         "--genesis-file",
         genesisFileIBFT2.toString(),
-        "--Xpoa-block-txs-selection-max-time",
+        "--poa-block-txs-selection-max-time",
         "80");
   }
 
   @Test
-  public void poaBlockTxsSelectionMaxTimeOutOfAllowedRange() {
-    internalTestFailure(
-        "Invalid value for option '--Xpoa-block-txs-selection-max-time': cannot convert '110' to Percentage",
-        "--Xpoa-block-txs-selection-max-time",
-        "110");
+  public void poaBlockTxsSelectionMaxTimeOptionOver100Percent() throws IOException {
+    final Path genesisFileIBFT2 = createFakeGenesisFile(VALID_GENESIS_IBFT2_POST_LONDON);
+    internalTestSuccess(
+        miningParams ->
+            assertThat(miningParams.getPoaBlockTxsSelectionMaxTime())
+                .isEqualTo(PositiveNumber.fromInt(200)),
+        "--genesis-file",
+        genesisFileIBFT2.toString(),
+        "--poa-block-txs-selection-max-time",
+        "200");
   }
 
   @Test
   public void poaBlockTxsSelectionMaxTimeOnlyCompatibleWithPoaNetworks() {
     internalTestFailure(
-        "--Xpoa-block-txs-selection-max-time can be only used with PoA networks, see --Xblock-txs-selection-max-time instead",
-        "--Xpoa-block-txs-selection-max-time",
+        "--poa-block-txs-selection-max-time can be only used with PoA networks, see --block-txs-selection-max-time instead",
+        "--poa-block-txs-selection-max-time",
         "90");
   }
 
diff --git a/besu/src/test/resources/everything_config.toml b/besu/src/test/resources/everything_config.toml
index c653f3f60fd..b8dae6c1889 100644
--- a/besu/src/test/resources/everything_config.toml
+++ b/besu/src/test/resources/everything_config.toml
@@ -142,6 +142,8 @@ min-priority-fee=0
 min-block-occupancy-ratio=0.7
 miner-stratum-host="0.0.0.0"
 miner-stratum-port=8008
+block-txs-selection-max-time=5000
+poa-block-txs-selection-max-time=75
 Xminer-remote-sealers-limit=1000
 Xminer-remote-sealers-hashrate-ttl=10
 Xpos-block-creation-max-time=5
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java
index 944cf426d73..26ac79ef384 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java
@@ -136,7 +136,7 @@ public BlockTransactionSelector(
     this.pluginTransactionSelector = pluginTransactionSelector;
     this.pluginOperationTracer = pluginTransactionSelector.getOperationTracer();
     blockWorldStateUpdater = worldState.updater();
-    blockTxsSelectionMaxTime = miningParameters.getUnstable().getBlockTxsSelectionMaxTime();
+    blockTxsSelectionMaxTime = miningParameters.getBlockTxsSelectionMaxTime();
   }
 
   private List<AbstractTransactionSelector> createTransactionSelectors(
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
index 0b0b2cd7831..e593569ff28 100644
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.awaitility.Awaitility.await;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
 import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.BLOCK_SELECTION_TIMEOUT;
 import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.PRIORITY_FEE_PER_GAS_BELOW_CURRENT_MIN;
 import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.SELECTED;
@@ -54,7 +54,6 @@
 import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters.MutableInitValues;
-import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters.Unstable;
 import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
@@ -85,7 +84,7 @@
 import org.hyperledger.besu.plugin.services.txselection.PluginTransactionSelectorFactory;
 import org.hyperledger.besu.plugin.services.txselection.TransactionEvaluationContext;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
-import org.hyperledger.besu.util.number.Percentage;
+import org.hyperledger.besu.util.number.PositiveNumber;
 
 import java.math.BigInteger;
 import java.time.Instant;
@@ -956,8 +955,8 @@ private void internalBlockSelectionTimeoutSimulation(
 
     final ProcessableBlockHeader blockHeader = createBlock(301_000);
     final Address miningBeneficiary = AddressHelpers.ofValue(1);
-    final int poaMinBlockTime = 1;
-    final long blockTxsSelectionMaxTime = 750;
+    final int poaGenesisBlockPeriod = 1;
+    final int blockTxsSelectionMaxTime = 750;
 
     final List<Transaction> transactionsToInject = new ArrayList<>(3);
     for (int i = 0; i < 2; i++) {
@@ -987,9 +986,14 @@ private void internalBlockSelectionTimeoutSimulation(
         createBlockSelectorAndSetupTxPool(
             isPoa
                 ? createMiningParameters(
-                    Wei.ZERO, MIN_OCCUPANCY_100_PERCENT, poaMinBlockTime, Percentage.fromInt(75))
+                    Wei.ZERO,
+                    MIN_OCCUPANCY_100_PERCENT,
+                    poaGenesisBlockPeriod,
+                    PositiveNumber.fromInt(75))
                 : createMiningParameters(
-                    Wei.ZERO, MIN_OCCUPANCY_100_PERCENT, blockTxsSelectionMaxTime),
+                    Wei.ZERO,
+                    MIN_OCCUPANCY_100_PERCENT,
+                    PositiveNumber.fromInt(blockTxsSelectionMaxTime)),
             transactionProcessor,
             blockHeader,
             miningBeneficiary,
@@ -1176,33 +1180,32 @@ private BlockHeader blockHeader(final long number) {
   }
 
   protected MiningParameters createMiningParameters(
-      final Wei minGasPrice, final double minBlockOccupancyRatio, final long txsSelectionMaxTime) {
+      final Wei minGasPrice,
+      final double minBlockOccupancyRatio,
+      final PositiveNumber txsSelectionMaxTime) {
     return ImmutableMiningParameters.builder()
         .mutableInitValues(
             MutableInitValues.builder()
                 .minTransactionGasPrice(minGasPrice)
                 .minBlockOccupancyRatio(minBlockOccupancyRatio)
                 .build())
-        .unstable(Unstable.builder().nonPoaBlockTxsSelectionMaxTime(txsSelectionMaxTime).build())
+        .nonPoaBlockTxsSelectionMaxTime(txsSelectionMaxTime)
         .build();
   }
 
   protected MiningParameters createMiningParameters(
       final Wei minGasPrice,
       final double minBlockOccupancyRatio,
-      final int minBlockTime,
-      final Percentage minBlockTimePercentage) {
+      final int genesisBlockPeriodSeconds,
+      final PositiveNumber minBlockTimePercentage) {
     return ImmutableMiningParameters.builder()
         .mutableInitValues(
             MutableInitValues.builder()
                 .minTransactionGasPrice(minGasPrice)
                 .minBlockOccupancyRatio(minBlockOccupancyRatio)
                 .build())
-        .unstable(
-            Unstable.builder()
-                .minBlockTime(minBlockTime)
-                .poaBlockTxsSelectionMaxTime(minBlockTimePercentage)
-                .build())
+        .genesisBlockPeriodSeconds(genesisBlockPeriodSeconds)
+        .poaBlockTxsSelectionMaxTime(minBlockTimePercentage)
         .build();
   }
 
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LondonFeeMarketBlockTransactionSelectorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LondonFeeMarketBlockTransactionSelectorTest.java
index 63e0d54ecd7..eb1a98cbd76 100644
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LondonFeeMarketBlockTransactionSelectorTest.java
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LondonFeeMarketBlockTransactionSelectorTest.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
 import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java
index 87d45be8184..14def049f15 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.chain;
 
 import static java.util.Collections.emptyList;
+import static org.hyperledger.besu.ethereum.trie.common.GenesisWorldStateProvider.createGenesisWorldState;
 
 import org.hyperledger.besu.config.GenesisAllocation;
 import org.hyperledger.besu.config.GenesisConfigFile;
@@ -32,14 +33,10 @@
 import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
-import org.hyperledger.besu.ethereum.trie.forest.storage.ForestWorldStateKeyValueStorage;
-import org.hyperledger.besu.ethereum.trie.forest.worldview.ForestMutableWorldState;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.evm.account.MutableAccount;
-import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.evm.log.LogsBloomFilter;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
-import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.math.BigInteger;
 import java.util.HashMap;
@@ -77,6 +74,21 @@ public static GenesisState fromJson(final String json, final ProtocolSchedule pr
     return fromConfig(GenesisConfigFile.fromConfig(json), protocolSchedule);
   }
 
+  /**
+   * Construct a {@link GenesisState} from a JSON string.
+   *
+   * @param dataStorageFormat A {@link DataStorageFormat} describing the storage format to use
+   * @param json A JSON string describing the genesis block
+   * @param protocolSchedule A protocol Schedule associated with
+   * @return A new {@link GenesisState}.
+   */
+  public static GenesisState fromJson(
+      final DataStorageFormat dataStorageFormat,
+      final String json,
+      final ProtocolSchedule protocolSchedule) {
+    return fromConfig(dataStorageFormat, GenesisConfigFile.fromConfig(json), protocolSchedule);
+  }
+
   /**
    * Construct a {@link GenesisState} from a JSON object.
    *
@@ -86,10 +98,28 @@ public static GenesisState fromJson(final String json, final ProtocolSchedule pr
    */
   public static GenesisState fromConfig(
       final GenesisConfigFile config, final ProtocolSchedule protocolSchedule) {
+    return fromConfig(DataStorageFormat.FOREST, config, protocolSchedule);
+  }
+
+  /**
+   * Construct a {@link GenesisState} from a JSON object.
+   *
+   * @param dataStorageFormat A {@link DataStorageFormat} describing the storage format to use
+   * @param config A {@link GenesisConfigFile} describing the genesis block.
+   * @param protocolSchedule A protocol Schedule associated with
+   * @return A new {@link GenesisState}.
+   */
+  public static GenesisState fromConfig(
+      final DataStorageFormat dataStorageFormat,
+      final GenesisConfigFile config,
+      final ProtocolSchedule protocolSchedule) {
     final List<GenesisAccount> genesisAccounts = parseAllocations(config).toList();
     final Block block =
         new Block(
-            buildHeader(config, calculateGenesisStateHash(genesisAccounts), protocolSchedule),
+            buildHeader(
+                config,
+                calculateGenesisStateHash(dataStorageFormat, genesisAccounts),
+                protocolSchedule),
             buildBody(config));
     return new GenesisState(block, genesisAccounts);
   }
@@ -133,15 +163,14 @@ private static void writeAccountsTo(
     target.persist(rootHeader);
   }
 
-  private static Hash calculateGenesisStateHash(final List<GenesisAccount> genesisAccounts) {
-    final ForestWorldStateKeyValueStorage stateStorage =
-        new ForestWorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final WorldStatePreimageKeyValueStorage preimageStorage =
-        new WorldStatePreimageKeyValueStorage(new InMemoryKeyValueStorage());
-    final MutableWorldState worldState =
-        new ForestMutableWorldState(stateStorage, preimageStorage, EvmConfiguration.DEFAULT);
-    writeAccountsTo(worldState, genesisAccounts, null);
-    return worldState.rootHash();
+  private static Hash calculateGenesisStateHash(
+      final DataStorageFormat dataStorageFormat, final List<GenesisAccount> genesisAccounts) {
+    try (var worldState = createGenesisWorldState(dataStorageFormat)) {
+      writeAccountsTo(worldState, genesisAccounts, null);
+      return worldState.rootHash();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
   }
 
   private static BlockHeader buildHeader(
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java
index 32ac5ee926a..7f543f370a3 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java
@@ -16,7 +16,7 @@
 
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.util.number.Percentage;
+import org.hyperledger.besu.util.number.PositiveNumber;
 
 import java.time.Duration;
 import java.util.Objects;
@@ -32,6 +32,10 @@
 @Value.Immutable
 @Value.Enclosing
 public abstract class MiningParameters {
+  public static final PositiveNumber DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME =
+      PositiveNumber.fromInt((int) Duration.ofSeconds(5).toMillis());
+  public static final PositiveNumber DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME =
+      PositiveNumber.fromInt(75);
   public static final MiningParameters MINING_DISABLED =
       ImmutableMiningParameters.builder()
           .mutableInitValues(
@@ -130,6 +134,28 @@ public int getStratumPort() {
     return 8008;
   }
 
+  @Value.Default
+  public PositiveNumber getNonPoaBlockTxsSelectionMaxTime() {
+    return DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
+  }
+
+  @Value.Default
+  public PositiveNumber getPoaBlockTxsSelectionMaxTime() {
+    return DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME;
+  }
+
+  public abstract OptionalInt getGenesisBlockPeriodSeconds();
+
+  @Value.Derived
+  public long getBlockTxsSelectionMaxTime() {
+    if (getGenesisBlockPeriodSeconds().isPresent()) {
+      return (TimeUnit.SECONDS.toMillis(getGenesisBlockPeriodSeconds().getAsInt())
+              * getPoaBlockTxsSelectionMaxTime().getValue())
+          / 100;
+    }
+    return getNonPoaBlockTxsSelectionMaxTime().getValue();
+  }
+
   @Value.Default
   protected MutableRuntimeValues getMutableRuntimeValues() {
     return new MutableRuntimeValues(getMutableInitValues());
@@ -266,8 +292,6 @@ public interface Unstable {
     int DEFAULT_MAX_OMMERS_DEPTH = 8;
     long DEFAULT_POS_BLOCK_CREATION_MAX_TIME = Duration.ofSeconds(12).toMillis();
     long DEFAULT_POS_BLOCK_CREATION_REPETITION_MIN_DURATION = Duration.ofMillis(500).toMillis();
-    long DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME = Duration.ofSeconds(5).toMillis();
-    Percentage DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME = Percentage.fromInt(75);
 
     MiningParameters.Unstable DEFAULT = ImmutableMiningParameters.Unstable.builder().build();
 
@@ -305,27 +329,5 @@ default long getPosBlockCreationRepetitionMinDuration() {
     default String getStratumExtranonce() {
       return "080c";
     }
-
-    @Value.Default
-    default long getNonPoaBlockTxsSelectionMaxTime() {
-      return DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME;
-    }
-
-    @Value.Default
-    default Percentage getPoaBlockTxsSelectionMaxTime() {
-      return DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME;
-    }
-
-    OptionalInt getMinBlockTime();
-
-    @Value.Derived
-    default long getBlockTxsSelectionMaxTime() {
-      if (getMinBlockTime().isPresent()) {
-        return (TimeUnit.SECONDS.toMillis(getMinBlockTime().getAsInt())
-                * getPoaBlockTxsSelectionMaxTime().getValue())
-            / 100;
-      }
-      return getNonPoaBlockTxsSelectionMaxTime();
-    }
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/cache/NoOpCachedWorldStorageManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/cache/NoOpCachedWorldStorageManager.java
new file mode 100644
index 00000000000..0359c464245
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/cache/NoOpCachedWorldStorageManager.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie.bonsai.cache;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.trie.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.trie.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+public class NoOpCachedWorldStorageManager extends CachedWorldStorageManager {
+
+  public NoOpCachedWorldStorageManager(
+      final BonsaiWorldStateKeyValueStorage bonsaiWorldStateKeyValueStorage) {
+    super(null, bonsaiWorldStateKeyValueStorage, new NoOpMetricsSystem());
+  }
+
+  @Override
+  public synchronized void addCachedLayer(
+      final BlockHeader blockHeader,
+      final Hash worldStateRootHash,
+      final BonsaiWorldState forWorldState) {
+    // no cache
+  }
+
+  @Override
+  public boolean containWorldStateStorage(final Hash blockHash) {
+    return false;
+  }
+
+  @Override
+  public Optional<BonsaiWorldState> getWorldState(final Hash blockHash) {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<BonsaiWorldState> getNearestWorldState(final BlockHeader blockHeader) {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<BonsaiWorldState> getHeadWorldState(
+      final Function<Hash, Optional<BlockHeader>> hashBlockHeaderFunction) {
+    return Optional.empty();
+  }
+
+  @Override
+  public void reset() {
+    // world states are not re-used
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/trielog/NoOpTrieLogManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/trielog/NoOpTrieLogManager.java
new file mode 100644
index 00000000000..7cb024a259d
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/trielog/NoOpTrieLogManager.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie.bonsai.trielog;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.trie.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.trie.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+
+import java.util.Optional;
+
+public class NoOpTrieLogManager extends TrieLogManager {
+
+  public NoOpTrieLogManager() {
+    super(null, null, 0, null, TrieLogPruner.noOpTrieLogPruner());
+  }
+
+  @Override
+  public synchronized void saveTrieLog(
+      final BonsaiWorldStateUpdateAccumulator localUpdater,
+      final Hash forWorldStateRootHash,
+      final BlockHeader forBlockHeader,
+      final BonsaiWorldState forWorldState) {
+    // notify trie log added observers, synchronously
+    TrieLog trieLog = trieLogFactory.create(localUpdater, forBlockHeader);
+    trieLogObservers.forEach(o -> o.onTrieLogAdded(new TrieLogAddedEvent(trieLog)));
+  }
+
+  @Override
+  public long getMaxLayersToLoad() {
+    return 0;
+  }
+
+  @Override
+  public Optional<TrieLog> getTrieLogLayer(final Hash blockHash) {
+    return Optional.empty();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/worldview/BonsaiWorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/worldview/BonsaiWorldState.java
index 548a3a1c414..4544a1c1de8 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/worldview/BonsaiWorldState.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/worldview/BonsaiWorldState.java
@@ -92,7 +92,7 @@ public BonsaiWorldState(
         evmConfiguration);
   }
 
-  protected BonsaiWorldState(
+  public BonsaiWorldState(
       final BonsaiWorldStateKeyValueStorage worldStateStorage,
       final CachedMerkleTrieLoader cachedMerkleTrieLoader,
       final CachedWorldStorageManager cachedWorldStorageManager,
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/common/GenesisWorldStateProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/common/GenesisWorldStateProvider.java
new file mode 100644
index 00000000000..ad1e920b77a
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/common/GenesisWorldStateProvider.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.trie.common;
+
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
+import org.hyperledger.besu.ethereum.trie.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.trie.bonsai.cache.NoOpCachedWorldStorageManager;
+import org.hyperledger.besu.ethereum.trie.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.trie.bonsai.trielog.NoOpTrieLogManager;
+import org.hyperledger.besu.ethereum.trie.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.trie.forest.storage.ForestWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.trie.forest.worldview.ForestMutableWorldState;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+import org.hyperledger.besu.services.kvstore.SegmentedInMemoryKeyValueStorage;
+
+import java.util.Objects;
+
+public class GenesisWorldStateProvider {
+
+  /**
+   * Creates a Genesis world state based on the provided data storage format.
+   *
+   * @param dataStorageFormat the data storage format to use
+   * @return a mutable world state for the Genesis block
+   */
+  public static MutableWorldState createGenesisWorldState(
+      final DataStorageFormat dataStorageFormat) {
+    if (Objects.requireNonNull(dataStorageFormat) == DataStorageFormat.BONSAI) {
+      return createGenesisBonsaiWorldState();
+    } else {
+      return createGenesisForestWorldState();
+    }
+  }
+
+  /**
+   * Creates a Genesis world state using the Bonsai data storage format.
+   *
+   * @return a mutable world state for the Genesis block
+   */
+  private static MutableWorldState createGenesisBonsaiWorldState() {
+    final CachedMerkleTrieLoader cachedMerkleTrieLoader =
+        new CachedMerkleTrieLoader(new NoOpMetricsSystem());
+    final BonsaiWorldStateKeyValueStorage bonsaiWorldStateKeyValueStorage =
+        new BonsaiWorldStateKeyValueStorage(
+            new KeyValueStorageProvider(
+                segmentIdentifiers -> new SegmentedInMemoryKeyValueStorage(),
+                new InMemoryKeyValueStorage(),
+                new NoOpMetricsSystem()),
+            new NoOpMetricsSystem());
+    return new BonsaiWorldState(
+        bonsaiWorldStateKeyValueStorage,
+        cachedMerkleTrieLoader,
+        new NoOpCachedWorldStorageManager(bonsaiWorldStateKeyValueStorage),
+        new NoOpTrieLogManager(),
+        EvmConfiguration.DEFAULT);
+  }
+
+  /**
+   * Creates a Genesis world state using the Forest data storage format.
+   *
+   * @return a mutable world state for the Genesis block
+   */
+  private static MutableWorldState createGenesisForestWorldState() {
+    final ForestWorldStateKeyValueStorage stateStorage =
+        new ForestWorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStatePreimageKeyValueStorage preimageStorage =
+        new WorldStatePreimageKeyValueStorage(new InMemoryKeyValueStorage());
+    return new ForestMutableWorldState(stateStorage, preimageStorage, EvmConfiguration.DEFAULT);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java
index 1a069542672..0a8fc12b628 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java
@@ -24,14 +24,21 @@
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.evm.account.Account;
 
+import java.util.stream.Stream;
+
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.bouncycastle.util.encoders.Hex;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
 
 public final class GenesisStateTest {
 
@@ -46,10 +53,20 @@ public final class GenesisStateTest {
   private static final String EXPECTED_CODE =
       "0x608060405260043610610116577c01000000000000000000000000000000000000000000000000000000006000350463025e7c278114610158578063173825d91461019e57806320ea8d86146101d15780632f54bf6e146101fb5780633411c81c14610242578063547415251461027b5780637065cb48146102c1578063784547a7146102f45780638b51d13f1461031e5780639ace38c214610348578063a0e67e2b14610415578063a8abe69a1461047a578063b5dc40c3146104ba578063b77bf600146104e4578063ba51a6df146104f9578063c01a8c8414610523578063c64274741461054d578063d74f8edd14610615578063dc8452cd1461062a578063e20056e61461063f578063ee22610b1461067a575b60003411156101565760408051348152905133917fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c919081900360200190a25b005b34801561016457600080fd5b506101826004803603602081101561017b57600080fd5b50356106a4565b60408051600160a060020a039092168252519081900360200190f35b3480156101aa57600080fd5b50610156600480360360208110156101c157600080fd5b5035600160a060020a03166106cc565b3480156101dd57600080fd5b50610156600480360360208110156101f457600080fd5b503561083c565b34801561020757600080fd5b5061022e6004803603602081101561021e57600080fd5b5035600160a060020a03166108f6565b604080519115158252519081900360200190f35b34801561024e57600080fd5b5061022e6004803603604081101561026557600080fd5b5080359060200135600160a060020a031661090b565b34801561028757600080fd5b506102af6004803603604081101561029e57600080fd5b50803515159060200135151561092b565b60408051918252519081900360200190f35b3480156102cd57600080fd5b50610156600480360360208110156102e457600080fd5b5035600160a060020a0316610997565b34801561030057600080fd5b5061022e6004803603602081101561031757600080fd5b5035610abc565b34801561032a57600080fd5b506102af6004803603602081101561034157600080fd5b5035610b43565b34801561035457600080fd5b506103726004803603602081101561036b57600080fd5b5035610bb2565b6040518085600160a060020a0316600160a060020a031681526020018481526020018060200183151515158152602001828103825284818151815260200191508051906020019080838360005b838110156103d75781810151838201526020016103bf565b50505050905090810190601f1680156104045780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561042157600080fd5b5061042a610c70565b60408051602080825283518183015283519192839290830191858101910280838360005b8381101561046657818101518382015260200161044e565b505050509050019250505060405180910390f35b34801561048657600080fd5b5061042a6004803603608081101561049d57600080fd5b508035906020810135906040810135151590606001351515610cd3565b3480156104c657600080fd5b5061042a600480360360208110156104dd57600080fd5b5035610e04565b3480156104f057600080fd5b506102af610f75565b34801561050557600080fd5b506101566004803603602081101561051c57600080fd5b5035610f7b565b34801561052f57600080fd5b506101566004803603602081101561054657600080fd5b5035610ffa565b34801561055957600080fd5b506102af6004803603606081101561057057600080fd5b600160a060020a03823516916020810135918101906060810160408201356401000000008111156105a057600080fd5b8201836020820111156105b257600080fd5b803590602001918460018302840111640100000000831117156105d457600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295506110c5945050505050565b34801561062157600080fd5b506102af6110e4565b34801561063657600080fd5b506102af6110e9565b34801561064b57600080fd5b506101566004803603604081101561066257600080fd5b50600160a060020a03813581169160200135166110ef565b34801561068657600080fd5b506101566004803603602081101561069d57600080fd5b5035611289565b60038054829081106106b257fe5b600091825260209091200154600160a060020a0316905081565b3330146106d857600080fd5b600160a060020a038116600090815260026020526040902054819060ff16151561070157600080fd5b600160a060020a0382166000908152600260205260408120805460ff191690555b600354600019018110156107d75782600160a060020a031660038281548110151561074957fe5b600091825260209091200154600160a060020a031614156107cf5760038054600019810190811061077657fe5b60009182526020909120015460038054600160a060020a03909216918390811061079c57fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a031602179055506107d7565b600101610722565b506003805460001901906107eb9082611557565b5060035460045411156108045760035461080490610f7b565b604051600160a060020a038316907f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9090600090a25050565b3360008181526002602052604090205460ff16151561085a57600080fd5b60008281526001602090815260408083203380855292529091205483919060ff16151561088657600080fd5b600084815260208190526040902060030154849060ff16156108a757600080fd5b6000858152600160209081526040808320338085529252808320805460ff191690555187927ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e991a35050505050565b60026020526000908152604090205460ff1681565b600160209081526000928352604080842090915290825290205460ff1681565b6000805b60055481101561099057838015610958575060008181526020819052604090206003015460ff16155b8061097c575082801561097c575060008181526020819052604090206003015460ff165b15610988576001820191505b60010161092f565b5092915050565b3330146109a357600080fd5b600160a060020a038116600090815260026020526040902054819060ff16156109cb57600080fd5b81600160a060020a03811615156109e157600080fd5b600380549050600101600454603282111580156109fe5750818111155b8015610a0957508015155b8015610a1457508115155b1515610a1f57600080fd5b600160a060020a038516600081815260026020526040808220805460ff1916600190811790915560038054918201815583527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b01805473ffffffffffffffffffffffffffffffffffffffff191684179055517ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d9190a25050505050565b600080805b600354811015610b3b5760008481526001602052604081206003805491929184908110610aea57fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610b1e576001820191505b600454821415610b3357600192505050610b3e565b600101610ac1565b50505b919050565b6000805b600354811015610bac5760008381526001602052604081206003805491929184908110610b7057fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610ba4576001820191505b600101610b47565b50919050565b6000602081815291815260409081902080546001808301546002808501805487516101009582161595909502600019011691909104601f8101889004880284018801909652858352600160a060020a0390931695909491929190830182828015610c5d5780601f10610c3257610100808354040283529160200191610c5d565b820191906000526020600020905b815481529060010190602001808311610c4057829003601f168201915b5050506003909301549192505060ff1684565b60606003805480602002602001604051908101604052809291908181526020018280548015610cc857602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610caa575b505050505090505b90565b606080600554604051908082528060200260200182016040528015610d02578160200160208202803883390190505b5090506000805b600554811015610d8457858015610d32575060008181526020819052604090206003015460ff16155b80610d565750848015610d56575060008181526020819052604090206003015460ff165b15610d7c57808383815181101515610d6a57fe5b60209081029091010152600191909101905b600101610d09565b878703604051908082528060200260200182016040528015610db0578160200160208202803883390190505b5093508790505b86811015610df9578281815181101515610dcd57fe5b9060200190602002015184898303815181101515610de757fe5b60209081029091010152600101610db7565b505050949350505050565b606080600380549050604051908082528060200260200182016040528015610e36578160200160208202803883390190505b5090506000805b600354811015610eee5760008581526001602052604081206003805491929184908110610e6657fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610ee6576003805482908110610ea157fe5b6000918252602090912001548351600160a060020a0390911690849084908110610ec757fe5b600160a060020a03909216602092830290910190910152600191909101905b600101610e3d565b81604051908082528060200260200182016040528015610f18578160200160208202803883390190505b509350600090505b81811015610f6d578281815181101515610f3657fe5b906020019060200201518482815181101515610f4e57fe5b600160a060020a03909216602092830290910190910152600101610f20565b505050919050565b60055481565b333014610f8757600080fd5b6003548160328211801590610f9c5750818111155b8015610fa757508015155b8015610fb257508115155b1515610fbd57600080fd5b60048390556040805184815290517fa3f1ee9126a074d9326c682f561767f710e927faa811f7a99829d49dc421797a9181900360200190a1505050565b3360008181526002602052604090205460ff16151561101857600080fd5b6000828152602081905260409020548290600160a060020a0316151561103d57600080fd5b60008381526001602090815260408083203380855292529091205484919060ff161561106857600080fd5b6000858152600160208181526040808420338086529252808420805460ff1916909317909255905187927f4a504a94899432a9846e1aa406dceb1bcfd538bb839071d49d1e5e23f5be30ef91a36110be85611289565b5050505050565b60006110d2848484611444565b90506110dd81610ffa565b9392505050565b603281565b60045481565b3330146110fb57600080fd5b600160a060020a038216600090815260026020526040902054829060ff16151561112457600080fd5b600160a060020a038216600090815260026020526040902054829060ff161561114c57600080fd5b82600160a060020a038116151561116257600080fd5b60005b6003548110156111ee5785600160a060020a031660038281548110151561118857fe5b600091825260209091200154600160a060020a031614156111e657846003828154811015156111b357fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a031602179055506111ee565b600101611165565b50600160a060020a03808616600081815260026020526040808220805460ff1990811690915593881682528082208054909416600117909355915190917f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9091a2604051600160a060020a038516907ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d90600090a25050505050565b3360008181526002602052604090205460ff1615156112a757600080fd5b60008281526001602090815260408083203380855292529091205483919060ff1615156112d357600080fd5b600084815260208190526040902060030154849060ff16156112f457600080fd5b6112fd85610abc565b156110be576000858152602081815260409182902060038101805460ff19166001908117909155815481830154600280850180548851601f6000199783161561010002979097019091169290920494850187900487028201870190975283815293956113cf95600160a060020a039093169491939283908301828280156113c55780601f1061139a576101008083540402835291602001916113c5565b820191906000526020600020905b8154815290600101906020018083116113a857829003601f168201915b5050505050611534565b156114045760405186907f33e13ecb54c3076d8e8bb8c2881800a4d972b792045ffae98fdf46df365fed7590600090a261143c565b60405186907f526441bb6c1aba3c9a4a6ca1d6545da9c2333c8c48343ef398eb858d72b7923690600090a260038101805460ff191690555b505050505050565b600083600160a060020a038116151561145c57600080fd5b60055460408051608081018252600160a060020a0388811682526020808301898152838501898152600060608601819052878152808452959095208451815473ffffffffffffffffffffffffffffffffffffffff1916941693909317835551600183015592518051949650919390926114dc926002850192910190611580565b50606091909101516003909101805460ff191691151591909117905560058054600101905560405182907fc0ba8fe4b176c1714197d43b9cc6bcf797a4a7461c5fe8d0ef6e184ae7601e5190600090a2509392505050565b6000806040516020840160008287838a8c6187965a03f198975050505050505050565b81548183558181111561157b5760008381526020902061157b9181019083016115fe565b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106115c157805160ff19168380011785556115ee565b828001600101855582156115ee579182015b828111156115ee5782518255916020019190600101906115d3565b506115fa9291506115fe565b5090565b610cd091905b808211156115fa576000815560010161160456fea165627a7a7230582070d3c680a2cf749f81772e7fffa2883f27a13c65fcfff32190d7585b0c6f0ce40029";
 
-  @Test
-  public void createFromJsonWithAllocs() throws Exception {
+  static class GenesisStateTestArguments implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(final ExtensionContext context) {
+      return Stream.of(
+          Arguments.of(DataStorageFormat.BONSAI), Arguments.of(DataStorageFormat.FOREST));
+    }
+  }
+
+  @ParameterizedTest
+  @ArgumentsSource(GenesisStateTestArguments.class)
+  public void createFromJsonWithAllocs(final DataStorageFormat dataStorageFormat) throws Exception {
     final GenesisState genesisState =
         GenesisState.fromJson(
+            dataStorageFormat,
             Resources.toString(GenesisStateTest.class.getResource("genesis1.json"), Charsets.UTF_8),
             ProtocolScheduleFixture.MAINNET);
     final BlockHeader header = genesisState.getBlock().getHeader();
@@ -74,10 +91,12 @@ public void createFromJsonWithAllocs() throws Exception {
     assertThat(second.getBalance().toLong()).isEqualTo(222222222);
   }
 
-  @Test
-  public void createFromJsonNoAllocs() throws Exception {
+  @ParameterizedTest
+  @ArgumentsSource(GenesisStateTestArguments.class)
+  public void createFromJsonNoAllocs(final DataStorageFormat dataStorageFormat) throws Exception {
     final GenesisState genesisState =
         GenesisState.fromJson(
+            dataStorageFormat,
             Resources.toString(GenesisStateTest.class.getResource("genesis2.json"), Charsets.UTF_8),
             ProtocolScheduleFixture.MAINNET);
     final BlockHeader header = genesisState.getBlock().getHeader();
@@ -89,10 +108,12 @@ public void createFromJsonNoAllocs() throws Exception {
     assertThat(header.getParentHash()).isEqualTo(Hash.ZERO);
   }
 
-  private void assertContractInvariants(final String sourceFile, final String blockHash)
+  private void assertContractInvariants(
+      final DataStorageFormat dataStorageFormat, final String sourceFile, final String blockHash)
       throws Exception {
     final GenesisState genesisState =
         GenesisState.fromJson(
+            dataStorageFormat,
             Resources.toString(GenesisStateTest.class.getResource(sourceFile), Charsets.UTF_8),
             ProtocolScheduleFixture.MAINNET);
     final BlockHeader header = genesisState.getBlock().getHeader();
@@ -113,16 +134,22 @@ private void assertContractInvariants(final String sourceFile, final String bloc
         "000000000000000000000000385ef55e292fa39cf5ffbad99f534294565519ba");
   }
 
-  @Test
-  public void createFromJsonWithContract() throws Exception {
+  @ParameterizedTest
+  @ArgumentsSource(GenesisStateTestArguments.class)
+  public void createFromJsonWithContract(final DataStorageFormat dataStorageFormat)
+      throws Exception {
     assertContractInvariants(
-        "genesis3.json", "0xe7fd8db206dcaf066b7c97b8a42a0abc18653613560748557ab44868652a78b6");
+        dataStorageFormat,
+        "genesis3.json",
+        "0xe7fd8db206dcaf066b7c97b8a42a0abc18653613560748557ab44868652a78b6");
   }
 
-  @Test
-  public void createFromJsonWithNonce() throws Exception {
+  @ParameterizedTest
+  @ArgumentsSource(GenesisStateTestArguments.class)
+  public void createFromJsonWithNonce(final DataStorageFormat dataStorageFormat) throws Exception {
     final GenesisState genesisState =
         GenesisState.fromJson(
+            dataStorageFormat,
             Resources.toString(
                 GenesisStateTest.class.getResource("genesisNonce.json"), Charsets.UTF_8),
             ProtocolScheduleFixture.MAINNET);
@@ -133,10 +160,12 @@ public void createFromJsonWithNonce() throws Exception {
                 "0x36750291f1a8429aeb553a790dc2d149d04dbba0ca4cfc7fd5eb12d478117c9f"));
   }
 
-  @Test
-  public void encodeOlympicBlock() throws Exception {
+  @ParameterizedTest
+  @ArgumentsSource(GenesisStateTestArguments.class)
+  public void encodeOlympicBlock(final DataStorageFormat dataStorageFormat) throws Exception {
     final GenesisState genesisState =
         GenesisState.fromJson(
+            dataStorageFormat,
             Resources.toString(
                 GenesisStateTest.class.getResource("genesis-olympic.json"), Charsets.UTF_8),
             ProtocolScheduleFixture.MAINNET);
@@ -152,10 +181,12 @@ private void assertStorageValue(final Account contract, final String key, final
         .isEqualTo(UInt256.fromHexString(value));
   }
 
-  @Test
-  public void genesisFromShanghai() throws Exception {
+  @ParameterizedTest
+  @ArgumentsSource(GenesisStateTestArguments.class)
+  public void genesisFromShanghai(final DataStorageFormat dataStorageFormat) throws Exception {
     final GenesisState genesisState =
         GenesisState.fromJson(
+            dataStorageFormat,
             Resources.toString(
                 GenesisStateTest.class.getResource("genesis_shanghai.json"), Charsets.UTF_8),
             ProtocolScheduleFixture.MAINNET);
@@ -200,10 +231,12 @@ public void genesisFromShanghai() throws Exception {
     assertThat(lastBalance).isEqualTo(Wei.fromHexString("0x123450000000000000000"));
   }
 
-  @Test
-  public void genesisFromCancun() throws Exception {
+  @ParameterizedTest
+  @ArgumentsSource(GenesisStateTestArguments.class)
+  public void genesisFromCancun(final DataStorageFormat dataStorageFormat) throws Exception {
     final GenesisState genesisState =
         GenesisState.fromJson(
+            dataStorageFormat,
             Resources.toString(
                 GenesisStateTest.class.getResource("genesis_cancun.json"), Charsets.UTF_8),
             ProtocolScheduleFixture.MAINNET);
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/BonsaiReferenceTestWorldState.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/BonsaiReferenceTestWorldState.java
index 26fd811bfae..034f8b9debf 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/BonsaiReferenceTestWorldState.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/BonsaiReferenceTestWorldState.java
@@ -20,22 +20,18 @@
 import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.trie.bonsai.cache.CachedMerkleTrieLoader;
 import org.hyperledger.besu.ethereum.trie.bonsai.cache.CachedWorldStorageManager;
+import org.hyperledger.besu.ethereum.trie.bonsai.cache.NoOpCachedWorldStorageManager;
 import org.hyperledger.besu.ethereum.trie.bonsai.storage.BonsaiPreImageProxy;
 import org.hyperledger.besu.ethereum.trie.bonsai.storage.BonsaiWorldStateKeyValueStorage;
-import org.hyperledger.besu.ethereum.trie.bonsai.trielog.TrieLogAddedEvent;
+import org.hyperledger.besu.ethereum.trie.bonsai.trielog.NoOpTrieLogManager;
 import org.hyperledger.besu.ethereum.trie.bonsai.trielog.TrieLogManager;
-import org.hyperledger.besu.ethereum.trie.bonsai.trielog.TrieLogPruner;
 import org.hyperledger.besu.ethereum.trie.bonsai.worldview.BonsaiWorldState;
-import org.hyperledger.besu.ethereum.trie.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
 
 import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -117,14 +113,14 @@ public static BonsaiReferenceTestWorldState create(
     final BonsaiPreImageProxy preImageProxy =
         new BonsaiPreImageProxy.BonsaiReferenceTestPreImageProxy();
 
+    final BonsaiWorldStateKeyValueStorage bonsaiWorldStateKeyValueStorage =
+        new BonsaiWorldStateKeyValueStorage(new InMemoryKeyValueStorageProvider(), metricsSystem);
+
     final BonsaiReferenceTestWorldStateStorage worldStateStorage =
-        new BonsaiReferenceTestWorldStateStorage(
-            new BonsaiWorldStateKeyValueStorage(
-                new InMemoryKeyValueStorageProvider(), metricsSystem),
-            preImageProxy);
+        new BonsaiReferenceTestWorldStateStorage(bonsaiWorldStateKeyValueStorage, preImageProxy);
 
     final NoOpCachedWorldStorageManager noOpCachedWorldStorageManager =
-        new NoOpCachedWorldStorageManager();
+        new NoOpCachedWorldStorageManager(bonsaiWorldStateKeyValueStorage);
 
     final BonsaiReferenceTestWorldState worldState =
         new BonsaiReferenceTestWorldState(
@@ -149,81 +145,6 @@ public Stream<StreamableAccount> streamAccounts(final Bytes32 startKeyHash, fina
     return this.refTestStorage.streamAccounts(this, startKeyHash, limit);
   }
 
-  static class NoOpCachedWorldStorageManager extends CachedWorldStorageManager {
-
-    public NoOpCachedWorldStorageManager() {
-      super(
-          null,
-          new BonsaiWorldStateKeyValueStorage(
-              new InMemoryKeyValueStorageProvider(), new NoOpMetricsSystem()),
-          new NoOpMetricsSystem());
-    }
-
-    @SuppressWarnings({"UnsynchronizedOverridesSynchronized", "squid:S3551"})
-    @Override
-    public void addCachedLayer(
-        final BlockHeader blockHeader,
-        final Hash worldStateRootHash,
-        final BonsaiWorldState forWorldState) {
-      // reference test world states are not cached
-    }
-
-    @Override
-    public boolean containWorldStateStorage(final Hash blockHash) {
-      return false;
-    }
-
-    @Override
-    public Optional<BonsaiWorldState> getWorldState(final Hash blockHash) {
-      return Optional.empty();
-    }
-
-    @Override
-    public Optional<BonsaiWorldState> getNearestWorldState(final BlockHeader blockHeader) {
-      return Optional.empty();
-    }
-
-    @Override
-    public Optional<BonsaiWorldState> getHeadWorldState(
-        final Function<Hash, Optional<BlockHeader>> hashBlockHeaderFunction) {
-      return Optional.empty();
-    }
-
-    @Override
-    public void reset() {
-      // reference test world states are not re-used
-    }
-  }
-
-  static class NoOpTrieLogManager extends TrieLogManager {
-
-    public NoOpTrieLogManager() {
-      super(null, null, 0, null, TrieLogPruner.noOpTrieLogPruner());
-    }
-
-    @SuppressWarnings({"UnsynchronizedOverridesSynchronized", "squid:S3551"})
-    @Override
-    public void saveTrieLog(
-        final BonsaiWorldStateUpdateAccumulator localUpdater,
-        final Hash forWorldStateRootHash,
-        final BlockHeader forBlockHeader,
-        final BonsaiWorldState forWorldState) {
-      // notify trie log added observers, synchronously
-      TrieLog trieLog = trieLogFactory.create(localUpdater, forBlockHeader);
-      trieLogObservers.forEach(o -> o.onTrieLogAdded(new TrieLogAddedEvent(trieLog)));
-    }
-
-    @Override
-    public long getMaxLayersToLoad() {
-      return 0;
-    }
-
-    @Override
-    public Optional<TrieLog> getTrieLogLayer(final Hash blockHash) {
-      return Optional.empty();
-    }
-  }
-
   @Override
   protected Hash hashAndSavePreImage(final Bytes value) {
     // by default do not save has preImages