diff --git a/crates/rpc/rpc-eth-api/src/helpers/trace.rs b/crates/rpc/rpc-eth-api/src/helpers/trace.rs
index da1d1cdb91..fa70b2df2e 100644
--- a/crates/rpc/rpc-eth-api/src/helpers/trace.rs
+++ b/crates/rpc/rpc-eth-api/src/helpers/trace.rs
@@ -195,11 +195,7 @@ pub trait Trace: LoadState<Evm: ConfigureEvm<Header = Header>> {
                 let block_txs = block.transactions_with_sender();
 
                 // apply relevant system calls
-                let mut system_caller = SystemCaller::new(
-                    this.evm_config().clone(),
-                    RpcNodeCore::provider(&this).chain_spec(),
-                );
-                system_caller
+                SystemCaller::new(this.evm_config().clone(), this.provider().chain_spec())
                     .pre_block_beacon_root_contract_call(
                         &mut db,
                         &cfg,
@@ -338,11 +334,7 @@ pub trait Trace: LoadState<Evm: ConfigureEvm<Header = Header>> {
                     CacheDB::new(StateProviderDatabase::new(StateProviderTraitObjWrapper(&state)));
 
                 // apply relevant system calls
-                let mut system_caller = SystemCaller::new(
-                    this.evm_config().clone(),
-                    RpcNodeCore::provider(&this).chain_spec(),
-                );
-                system_caller
+                SystemCaller::new(this.evm_config().clone(), this.provider().chain_spec())
                     .pre_block_beacon_root_contract_call(
                         &mut db,
                         &cfg,
diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs
index 8b9e160232..e2746a53cd 100644
--- a/crates/rpc/rpc/src/debug.rs
+++ b/crates/rpc/rpc/src/debug.rs
@@ -113,24 +113,22 @@ where
                 let mut results = Vec::with_capacity(transactions.len());
                 let mut db = CacheDB::new(StateProviderDatabase::new(state));
 
-                let mut system_caller = SystemCaller::new(
-                    RpcNodeCore::evm_config(this.eth_api()).clone(),
-                    RpcNodeCore::provider(this.eth_api()).chain_spec(),
-                );
-
                 // apply relevant system calls
-                system_caller
-                    .pre_block_beacon_root_contract_call(
-                        &mut db,
-                        &cfg,
-                        &block_env,
-                        parent_beacon_block_root,
+                SystemCaller::new(
+                    this.eth_api().evm_config().clone(),
+                    this.eth_api().provider().chain_spec(),
+                )
+                .pre_block_beacon_root_contract_call(
+                    &mut db,
+                    &cfg,
+                    &block_env,
+                    parent_beacon_block_root,
+                )
+                .map_err(|_| {
+                    EthApiError::EvmCustom(
+                        "failed to apply 4788 beacon root system call".to_string(),
                     )
-                    .map_err(|_| {
-                        EthApiError::EvmCustom(
-                            "failed to apply 4788 beacon root system call".to_string(),
-                        )
-                    })?;
+                })?;
 
                 let mut transactions = transactions.into_iter().enumerate().peekable();
                 let mut inspector = None;
@@ -296,23 +294,21 @@ where
                 let mut db = CacheDB::new(StateProviderDatabase::new(state));
 
                 // apply relevant system calls
-                let mut system_caller = SystemCaller::new(
-                    RpcNodeCore::evm_config(this.eth_api()).clone(),
-                    RpcNodeCore::provider(this.eth_api()).chain_spec(),
-                );
-
-                system_caller
-                    .pre_block_beacon_root_contract_call(
-                        &mut db,
-                        &cfg,
-                        &block_env,
-                        parent_beacon_block_root,
+                SystemCaller::new(
+                    this.eth_api().evm_config().clone(),
+                    this.eth_api().provider().chain_spec(),
+                )
+                .pre_block_beacon_root_contract_call(
+                    &mut db,
+                    &cfg,
+                    &block_env,
+                    parent_beacon_block_root,
+                )
+                .map_err(|_| {
+                    EthApiError::EvmCustom(
+                        "failed to apply 4788 beacon root system call".to_string(),
                     )
-                    .map_err(|_| {
-                        EthApiError::EvmCustom(
-                            "failed to apply 4788 beacon root system call".to_string(),
-                        )
-                    })?;
+                })?;
 
                 // replay all transactions prior to the targeted transaction
                 let index = this.eth_api().replay_transactions_until(