diff --git a/rskj-core/src/main/java/co/rsk/RskContext.java b/rskj-core/src/main/java/co/rsk/RskContext.java
index dc4c49a1f7d..169304d22b7 100644
--- a/rskj-core/src/main/java/co/rsk/RskContext.java
+++ b/rskj-core/src/main/java/co/rsk/RskContext.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk;
 
 import co.rsk.bitcoinj.core.NetworkParameters;
@@ -402,7 +401,7 @@ public TxQuotaChecker getTxQuotaChecker() {
         checkIfNotClosed();
 
         if (this.txQuotaChecker == null) {
-            this.txQuotaChecker = new TxQuotaChecker(System::currentTimeMillis);
+            this.txQuotaChecker = new TxQuotaChecker(System::currentTimeMillis, getReceivedTxSignatureCache());
         }
         return txQuotaChecker;
     }
@@ -417,6 +416,16 @@ public synchronized ReceivedTxSignatureCache getReceivedTxSignatureCache() {
         return receivedTxSignatureCache;
     }
 
+    public BlockTxSignatureCache getBlockTxSignatureCache() {
+        checkIfNotClosed();
+
+        if (blockTxSignatureCache == null) {
+            blockTxSignatureCache = new BlockTxSignatureCache(getReceivedTxSignatureCache());
+        }
+
+        return blockTxSignatureCache;
+    }
+
     public synchronized RepositoryLocator getRepositoryLocator() {
         checkIfNotClosed();
 
@@ -485,7 +494,10 @@ public synchronized PrecompiledContracts getPrecompiledContracts() {
         checkIfNotClosed();
 
         if (precompiledContracts == null) {
-            precompiledContracts = new PrecompiledContracts(getRskSystemProperties(), getBridgeSupportFactory());
+            precompiledContracts = new PrecompiledContracts(
+                    getRskSystemProperties(),
+                    getBridgeSupportFactory(),
+                    getBlockTxSignatureCache());
         }
 
         return precompiledContracts;
@@ -497,7 +509,7 @@ public synchronized BridgeSupportFactory getBridgeSupportFactory() {
         if (bridgeSupportFactory == null) {
             bridgeSupportFactory = new BridgeSupportFactory(getBtcBlockStoreFactory(),
                     getRskSystemProperties().getNetworkConstants().getBridgeConstants(),
-                    getRskSystemProperties().getActivationConfig());
+                    getRskSystemProperties().getActivationConfig(), getBlockTxSignatureCache());
         }
 
         return bridgeSupportFactory;
@@ -815,7 +827,8 @@ public synchronized TraceModule getTraceModule() {
                     getBlockStore(),
                     getReceiptStore(),
                     getBlockExecutor(),
-                    getExecutionBlockRetriever()
+                    getExecutionBlockRetriever(),
+                    getBlockTxSignatureCache()
             );
         }
 
@@ -836,7 +849,7 @@ public synchronized TxPoolModule getTxPoolModule() {
         checkIfNotClosed();
 
         if (txPoolModule == null) {
-            txPoolModule = new TxPoolModuleImpl(getTransactionPool());
+            txPoolModule = new TxPoolModuleImpl(getTransactionPool(), getReceivedTxSignatureCache());
         }
 
         return txPoolModule;
@@ -1101,7 +1114,7 @@ public synchronized BlockParentDependantValidationRule getBlockParentDependantVa
         if (blockParentDependantValidationRule == null) {
             Constants commonConstants = getRskSystemProperties().getNetworkConstants();
             blockParentDependantValidationRule = new BlockParentCompositeRule(
-                    new BlockTxsFieldsValidationRule(),
+                    new BlockTxsFieldsValidationRule(getBlockTxSignatureCache()),
                     new BlockTxsValidationRule(getRepositoryLocator(), getBlockTxSignatureCache()),
                     new PrevMinGasPriceRule(),
                     new BlockParentNumberRule(),
@@ -1288,7 +1301,8 @@ protected synchronized Web3 buildWeb3() {
                 getBuildInfo(),
                 getBlocksBloomStore(),
                 getWeb3InformationRetriever(),
-                getSyncProcessor());
+                getSyncProcessor(),
+                getBlockTxSignatureCache());
     }
 
     protected synchronized Web3InformationRetriever getWeb3InformationRetriever() {
@@ -1442,14 +1456,6 @@ private void initializeNativeLibs() {
         AbstractAltBN128.init();
     }
 
-    private BlockTxSignatureCache getBlockTxSignatureCache() {
-        if (blockTxSignatureCache == null) {
-            blockTxSignatureCache = new BlockTxSignatureCache(getReceivedTxSignatureCache());
-        }
-
-        return blockTxSignatureCache;
-    }
-
     private KeyValueDataSource getBlocksBloomDataSource() {
         if (this.blocksBloomDataSource == null) {
             this.blocksBloomDataSource = this.buildBlocksBloomDataSource();
@@ -1766,7 +1772,8 @@ private BlockToMineBuilder getBlockToMineBuilder() {
                     getBlockFactory(),
                     getBlockExecutor(),
                     new MinimumGasPriceCalculator(Coin.valueOf(getMiningConfig().getMinGasPriceTarget())),
-                    new MinerUtils()
+                    new MinerUtils(),
+                    getBlockTxSignatureCache()
             );
         }
 
diff --git a/rskj-core/src/main/java/co/rsk/core/bc/PendingState.java b/rskj-core/src/main/java/co/rsk/core/bc/PendingState.java
index 0c794416701..d4ff4529751 100644
--- a/rskj-core/src/main/java/co/rsk/core/bc/PendingState.java
+++ b/rskj-core/src/main/java/co/rsk/core/bc/PendingState.java
@@ -15,17 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.core.bc;
 
 import co.rsk.core.Coin;
 import co.rsk.core.RskAddress;
 import co.rsk.crypto.Keccak256;
 import co.rsk.db.RepositorySnapshot;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
-import org.ethereum.core.TransactionExecutor;
-import org.ethereum.core.TransactionSet;
+import org.ethereum.core.*;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.DataWord;
 import org.slf4j.Logger;
@@ -46,12 +42,13 @@ public class PendingState implements AccountInformationProvider {
     private final TransactionExecutorFactory transactionExecutorFactory;
     private final TransactionSet pendingTransactions;
     private boolean executed = false;
+    private final SignatureCache signatureCache;
 
-
-    public PendingState(RepositorySnapshot repository, TransactionSet pendingTransactions, TransactionExecutorFactory transactionExecutorFactory) {
+    public PendingState(RepositorySnapshot repository, TransactionSet pendingTransactions, TransactionExecutorFactory transactionExecutorFactory, SignatureCache signatureCache) {
         this.pendingRepository = repository.startTracking();
         this.pendingTransactions = pendingTransactions;
         this.transactionExecutorFactory = transactionExecutorFactory;
+        this.signatureCache = signatureCache;
     }
 
     @Override
@@ -117,13 +114,13 @@ public BigInteger getNonce(RskAddress addr) {
 
     // Note that this sort doesn't return the best solution, it is an approximation algorithm to find approximate
     // solution. (No trivial solution)
-    public static List<Transaction> sortByPriceTakingIntoAccountSenderAndNonce(List<Transaction> transactions) {
+    public static List<Transaction> sortByPriceTakingIntoAccountSenderAndNonce(List<Transaction> transactions, SignatureCache signatureCache) {
 
         //Priority heap, and list of transactions are ordered by descending gas price.
         Comparator<Transaction> gasPriceComparator = reverseOrder(Comparator.comparing(Transaction::getGasPrice));
 
         //First create a map to separate txs by each sender.
-        Map<RskAddress, List<Transaction>> senderTxs = transactions.stream().collect(Collectors.groupingBy(Transaction::getSender));
+        Map<RskAddress, List<Transaction>> senderTxs = transactions.stream().collect(Collectors.groupingBy(transaction -> transaction.getSender(signatureCache)));
 
         //For each sender, order all txs by nonce and then by hash,
         //finally we order by price in cases where nonce are equal, and then by hash to disambiguate
@@ -151,7 +148,7 @@ public static List<Transaction> sortByPriceTakingIntoAccountSenderAndNonce(List<
         while (txsCount > 0) {
             Transaction nextTxToAdd = candidateTxs.remove();
             sortedTxs.add(nextTxToAdd);
-            List<Transaction> txs = senderTxs.get(nextTxToAdd.getSender());
+            List<Transaction> txs = senderTxs.get(nextTxToAdd.getSender(signatureCache));
             if (!txs.isEmpty()) {
                 Transaction tx = txs.remove(0);
                 candidateTxs.add(tx);
@@ -172,8 +169,7 @@ private <T> T postExecutionReturn(PostExecutionAction<T> action) {
     }
 
     private void executeTransactions(Repository currentRepository, List<Transaction> pendingTransactions) {
-
-        PendingState.sortByPriceTakingIntoAccountSenderAndNonce(pendingTransactions)
+        PendingState.sortByPriceTakingIntoAccountSenderAndNonce(pendingTransactions, signatureCache)
                 .forEach(pendingTransaction -> executeTransaction(currentRepository, pendingTransaction));
     }
 
diff --git a/rskj-core/src/main/java/co/rsk/core/bc/TransactionPoolImpl.java b/rskj-core/src/main/java/co/rsk/core/bc/TransactionPoolImpl.java
index d3e93159a52..1b784dd62fc 100644
--- a/rskj-core/src/main/java/co/rsk/core/bc/TransactionPoolImpl.java
+++ b/rskj-core/src/main/java/co/rsk/core/bc/TransactionPoolImpl.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.core.bc;
 
 import co.rsk.config.RskSystemProperties;
@@ -52,8 +51,8 @@
 public class TransactionPoolImpl implements TransactionPool {
     private static final Logger logger = LoggerFactory.getLogger("txpool");
 
-    private final TransactionSet pendingTransactions = new TransactionSet();
-    private final TransactionSet queuedTransactions = new TransactionSet();
+    private final TransactionSet pendingTransactions;
+    private final TransactionSet queuedTransactions;
 
     private final Map<Keccak256, Long> transactionBlocks = new HashMap<>();
     private final Map<Keccak256, Long> transactionTimes = new HashMap<>();
@@ -95,7 +94,10 @@ public TransactionPoolImpl(RskSystemProperties config, RepositoryLocator reposit
         this.quotaChecker = txQuotaChecker;
         this.gasPriceTracker = gasPriceTracker;
 
-        this.validator = new TxPendingValidator(config.getNetworkConstants(), config.getActivationConfig(), config.getNumOfAccountSlots());
+        pendingTransactions = new TransactionSet(this.signatureCache);
+        queuedTransactions = new TransactionSet(this.signatureCache);
+
+        this.validator = new TxPendingValidator(config.getNetworkConstants(), config.getActivationConfig(), config.getNumOfAccountSlots(), signatureCache);
 
         if (this.outdatedTimeout > 0) {
             this.cleanerTimer = Executors.newSingleThreadScheduledExecutor(r -> new Thread(r, "TransactionPoolCleanerTimer"));
@@ -158,7 +160,7 @@ public PendingState getPendingState() {
 
     private PendingState getPendingState(RepositorySnapshot currentRepository) {
         removeObsoleteTransactions(this.outdatedThreshold, this.outdatedTimeout);
-        return new PendingState(currentRepository, new TransactionSet(pendingTransactions), (repository, tx) -> transactionExecutorFactory.newInstance(tx, 0, bestBlock.getCoinbase(), repository, createFakePendingBlock(bestBlock), 0));
+        return new PendingState(currentRepository, new TransactionSet(pendingTransactions, signatureCache), (repository, tx) -> transactionExecutorFactory.newInstance(tx, 0, bestBlock.getCoinbase(), repository, createFakePendingBlock(bestBlock), 0), signatureCache);
     }
 
     private RepositorySnapshot getCurrentRepository() {
@@ -215,7 +217,7 @@ public synchronized List<Transaction> addTransactions(final List<Transaction> tx
     private Optional<Transaction> getQueuedSuccessor(Transaction tx) {
         BigInteger next = tx.getNonceAsInteger().add(BigInteger.ONE);
 
-        List<Transaction> txsaccount = this.queuedTransactions.getTransactionsWithSender(tx.getSender());
+        List<Transaction> txsaccount = this.queuedTransactions.getTransactionsWithSender(tx.getSender(signatureCache));
 
         if (txsaccount == null) {
             return Optional.empty();
@@ -243,7 +245,7 @@ private TransactionPoolAddResult internalAddTransaction(final Transaction tx) {
         Keccak256 hash = tx.getHash();
         logger.trace("add transaction {} {}", toBI(tx.getNonce()), tx.getHash());
 
-        Optional<Transaction> replacedTx = pendingTransactions.getTransactionsWithSender(tx.getSender()).stream().filter(t -> t.getNonceAsInteger().equals(tx.getNonceAsInteger())).findFirst();
+        Optional<Transaction> replacedTx = pendingTransactions.getTransactionsWithSender(tx.getSender(signatureCache)).stream().filter(t -> t.getNonceAsInteger().equals(tx.getNonceAsInteger())).findFirst();
         if (replacedTx.isPresent() && !isBumpingGasPriceForSameNonceTx(tx, replacedTx.get())) {
             return TransactionPoolAddResult.withError("gas price not enough to bump transaction");
         }
@@ -253,7 +255,7 @@ private TransactionPoolAddResult internalAddTransaction(final Transaction tx) {
         final long timestampSeconds = this.getCurrentTimeInSeconds();
         transactionTimes.put(hash, timestampSeconds);
 
-        BigInteger currentNonce = getPendingState(currentRepository).getNonce(tx.getSender());
+        BigInteger currentNonce = getPendingState(currentRepository).getNonce(tx.getSender(signatureCache));
         BigInteger txNonce = tx.getNonceAsInteger();
         if (txNonce.compareTo(currentNonce) > 0) {
             this.addQueuedTransaction(tx);
@@ -454,8 +456,7 @@ private Block createFakePendingBlock(Block best) {
     }
 
     private TransactionValidationResult shouldAcceptTx(Transaction tx, RepositorySnapshot currentRepository) {
-        AccountState state = currentRepository.getAccountState(tx.getSender(signatureCache));
-        return validator.isValid(tx, bestBlock, state);
+        return validator.isValid(tx, bestBlock, currentRepository.getAccountState(tx.getSender(signatureCache)));
     }
 
     /**
@@ -464,7 +465,7 @@ private TransactionValidationResult shouldAcceptTx(Transaction tx, RepositorySna
      * @return whether the sender balance is enough to pay for all pending transactions + newTx
      */
     private boolean senderCanPayPendingTransactionsAndNewTx(Transaction newTx, RepositorySnapshot currentRepository) {
-        List<Transaction> transactions = pendingTransactions.getTransactionsWithSender(newTx.getSender());
+        List<Transaction> transactions = pendingTransactions.getTransactionsWithSender(newTx.getSender(signatureCache));
 
         Coin accumTxCost = Coin.ZERO;
         for (Transaction t : transactions) {
@@ -472,7 +473,7 @@ private boolean senderCanPayPendingTransactionsAndNewTx(Transaction newTx, Repos
         }
 
         Coin costWithNewTx = accumTxCost.add(getTxBaseCost(newTx));
-        return costWithNewTx.compareTo(currentRepository.getBalance(newTx.getSender())) <= 0;
+        return costWithNewTx.compareTo(currentRepository.getBalance(newTx.getSender(signatureCache))) <= 0;
     }
 
     private Coin getTxBaseCost(Transaction tx) {
@@ -486,7 +487,7 @@ private Coin getTxBaseCost(Transaction tx) {
     }
 
     private long getTransactionCost(Transaction tx, long number) {
-        return tx.transactionCost(config.getNetworkConstants(), config.getActivationConfig().forBlock(number));
+        return tx.transactionCost(config.getNetworkConstants(), config.getActivationConfig().forBlock(number), signatureCache);
     }
 
 }
diff --git a/rskj-core/src/main/java/co/rsk/mine/BlockToMineBuilder.java b/rskj-core/src/main/java/co/rsk/mine/BlockToMineBuilder.java
index d887562334a..42b895dd20c 100644
--- a/rskj-core/src/main/java/co/rsk/mine/BlockToMineBuilder.java
+++ b/rskj-core/src/main/java/co/rsk/mine/BlockToMineBuilder.java
@@ -71,6 +71,8 @@ public class BlockToMineBuilder {
 
     private final ForkDetectionDataCalculator forkDetectionDataCalculator;
 
+    private final SignatureCache signatureCache;
+
     public BlockToMineBuilder(
             ActivationConfig activationConfig,
             MiningConfig miningConfig,
@@ -85,7 +87,8 @@ public BlockToMineBuilder(
             BlockFactory blockFactory,
             BlockExecutor blockExecutor,
             MinimumGasPriceCalculator minimumGasPriceCalculator,
-            MinerUtils minerUtils) {
+            MinerUtils minerUtils,
+            SignatureCache signatureCache) {
         this.activationConfig = Objects.requireNonNull(activationConfig);
         this.miningConfig = Objects.requireNonNull(miningConfig);
         this.repositoryLocator = Objects.requireNonNull(repositoryLocator);
@@ -100,6 +103,7 @@ public BlockToMineBuilder(
         this.executor = blockExecutor;
         this.minimumGasPriceCalculator = minimumGasPriceCalculator;
         this.minerUtils = minerUtils;
+        this.signatureCache = signatureCache;
     }
 
     /**
@@ -157,7 +161,7 @@ private List<BlockHeader> getUnclesHeaders(BlockHeader newBlockParentHeader) {
 
     private List<Transaction> getTransactions(List<Transaction> txsToRemove, BlockHeader parentHeader, Coin minGasPrice) {
         logger.debug("getting transactions from pending state");
-        List<Transaction> txs = minerUtils.getAllTransactions(transactionPool);
+        List<Transaction> txs = minerUtils.getAllTransactions(transactionPool, signatureCache);
         logger.debug("{} transaction(s) collected from pending state", txs.size());
 
         final long blockNumber = parentHeader.getNumber() + 1;
@@ -170,7 +174,7 @@ private List<Transaction> getTransactions(List<Transaction> txsToRemove, BlockHe
 
         final boolean isRskip252Enabled = activationConfig.isActive(ConsensusRule.RSKIP252, blockNumber);
 
-        return minerUtils.filterTransactions(txsToRemove, txs, accountNonces, originalRepo, minGasPrice, isRskip252Enabled);
+        return minerUtils.filterTransactions(txsToRemove, txs, accountNonces, originalRepo, minGasPrice, isRskip252Enabled, signatureCache);
     }
 
     private void removePendingTransactions(List<Transaction> transactions) {
diff --git a/rskj-core/src/main/java/co/rsk/mine/MinerUtils.java b/rskj-core/src/main/java/co/rsk/mine/MinerUtils.java
index ca2248f8b54..30f7fd0be8e 100644
--- a/rskj-core/src/main/java/co/rsk/mine/MinerUtils.java
+++ b/rskj-core/src/main/java/co/rsk/mine/MinerUtils.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.mine;
 
 import co.rsk.bitcoinj.core.BtcTransaction;
@@ -32,6 +31,7 @@
 import org.bouncycastle.util.Arrays;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.core.TransactionPool;
 import org.slf4j.Logger;
@@ -48,7 +48,6 @@
 import java.util.function.Function;
 
 public class MinerUtils {
-
     private static final Logger logger = LoggerFactory.getLogger("minerserver");
 
     public static co.rsk.bitcoinj.core.BtcTransaction getBitcoinMergedMiningCoinbaseTransaction(co.rsk.bitcoinj.core.NetworkParameters params, MinerWork work) {
@@ -163,21 +162,21 @@ public static byte[] buildMerkleProof(
         }
     }
 
-    public List<org.ethereum.core.Transaction> getAllTransactions(TransactionPool transactionPool) {
+    public List<org.ethereum.core.Transaction> getAllTransactions(TransactionPool transactionPool, SignatureCache signatureCache) {
 
         List<Transaction> txs = transactionPool.getPendingTransactions();
 
-        return PendingState.sortByPriceTakingIntoAccountSenderAndNonce(txs);
+        return PendingState.sortByPriceTakingIntoAccountSenderAndNonce(txs, signatureCache);
     }
 
-    public List<org.ethereum.core.Transaction> filterTransactions(List<Transaction> txsToRemove, List<Transaction> txs, Map<RskAddress, BigInteger> accountNonces, RepositorySnapshot originalRepo, Coin minGasPrice, boolean isRskip252Enabled) {
+    public List<org.ethereum.core.Transaction> filterTransactions(List<Transaction> txsToRemove, List<Transaction> txs, Map<RskAddress, BigInteger> accountNonces, RepositorySnapshot originalRepo, Coin minGasPrice, boolean isRskip252Enabled, SignatureCache signatureCache) {
         List<org.ethereum.core.Transaction> txsResult = new ArrayList<>();
         for (org.ethereum.core.Transaction tx : txs) {
             try {
                 Keccak256 hash = tx.getHash();
                 Coin txValue = tx.getValue();
                 BigInteger txNonce = new BigInteger(1, tx.getNonce());
-                RskAddress txSender = tx.getSender();
+                RskAddress txSender = tx.getSender(signatureCache);
                 logger.debug("Examining tx={} sender: {} value: {} nonce: {}", hash, txSender, txValue, txNonce);
 
                 BigInteger expectedNonce;
diff --git a/rskj-core/src/main/java/co/rsk/net/handler/TxPendingValidator.java b/rskj-core/src/main/java/co/rsk/net/handler/TxPendingValidator.java
index c01e9b8bb4f..74ab6e38636 100644
--- a/rskj-core/src/main/java/co/rsk/net/handler/TxPendingValidator.java
+++ b/rskj-core/src/main/java/co/rsk/net/handler/TxPendingValidator.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.net.handler;
 
 import co.rsk.core.Coin;
@@ -26,6 +25,7 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.core.AccountState;
 import org.ethereum.core.Block;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,9 +50,12 @@ public class TxPendingValidator {
     private final Constants constants;
     private final ActivationConfig activationConfig;
 
-    public TxPendingValidator(Constants constants, ActivationConfig activationConfig, int accountSlots) {
+    private final SignatureCache signatureCache;
+
+    public TxPendingValidator(Constants constants, ActivationConfig activationConfig, int accountSlots, SignatureCache signatureCache) {
         this.constants = constants;
         this.activationConfig = activationConfig;
+        this.signatureCache = signatureCache;
 
         validatorSteps.add(new TxNotNullValidator());
         validatorSteps.add(new TxValidatorNotRemascTxValidator());
@@ -61,7 +64,7 @@ public TxPendingValidator(Constants constants, ActivationConfig activationConfig
         validatorSteps.add(new TxValidatorNonceRangeValidator(accountSlots));
         validatorSteps.add(new TxValidatorAccountBalanceValidator());
         validatorSteps.add(new TxValidatorMinimuGasPriceValidator());
-        validatorSteps.add(new TxValidatorIntrinsicGasLimitValidator(constants, activationConfig));
+        validatorSteps.add(new TxValidatorIntrinsicGasLimitValidator(constants, activationConfig, signatureCache));
         validatorSteps.add(new TxValidatorMaximumGasPriceValidator(activationConfig));
     }
 
@@ -69,10 +72,12 @@ public TransactionValidationResult isValid(Transaction tx, Block executionBlock,
         BigInteger blockGasLimit = BigIntegers.fromUnsignedByteArray(executionBlock.getGasLimit());
         Coin minimumGasPrice = executionBlock.getMinimumGasPrice();
         long bestBlockNumber = executionBlock.getNumber();
-        long basicTxCost = tx.transactionCost(constants, activationConfig.forBlock(bestBlockNumber));
+        long basicTxCost = tx.transactionCost(constants, activationConfig.forBlock(bestBlockNumber), signatureCache);
 
         if (state == null && basicTxCost != 0) {
-            logger.trace("[tx={}, sender={}] account doesn't exist", tx.getHash(), tx.getSender());
+            if (logger.isTraceEnabled()) {
+                logger.trace("[tx={}, sender={}] account doesn't exist", tx.getHash(), tx.getSender(signatureCache));
+            }
             return TransactionValidationResult.withError("the sender account doesn't exist");
         }
 
diff --git a/rskj-core/src/main/java/co/rsk/net/handler/quota/TxQuotaChecker.java b/rskj-core/src/main/java/co/rsk/net/handler/quota/TxQuotaChecker.java
index 581c3791587..bff9690850d 100644
--- a/rskj-core/src/main/java/co/rsk/net/handler/quota/TxQuotaChecker.java
+++ b/rskj-core/src/main/java/co/rsk/net/handler/quota/TxQuotaChecker.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.net.handler.quota;
 
 import co.rsk.core.RskAddress;
@@ -24,6 +23,7 @@
 import co.rsk.util.MaxSizeHashMap;
 import co.rsk.util.TimeProvider;
 import org.ethereum.core.Block;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.listener.GasPriceTracker;
 import org.slf4j.Logger;
@@ -55,10 +55,13 @@ public class TxQuotaChecker {
 
     private final TimeProvider timeProvider;
 
-    public TxQuotaChecker(TimeProvider timeProvider) {
+    private final SignatureCache signatureCache;
+
+    public TxQuotaChecker(TimeProvider timeProvider, SignatureCache signatureCache) {
         this.accountQuotas = new MaxSizeHashMap<>(MAX_QUOTAS_SIZE, true);
         this.timeProvider = timeProvider;
         this.lastBlockGasLimit = UNKNOWN_LAST_BLOCK_GAS_LIMIT;
+        this.signatureCache = signatureCache;
     }
 
     /**
@@ -118,7 +121,7 @@ private void updateReceiverQuotaIfRequired(Transaction newTx, CurrentContext cur
     }
 
     private boolean isFirstTxFromSender(Transaction newTx, CurrentContext currentContext) {
-        RskAddress senderAddress = newTx.getSender();
+        RskAddress senderAddress = newTx.getSender(signatureCache);
 
         TxQuota quotaForSender = this.accountQuotas.get(senderAddress);
         long accountNonce = currentContext.state.getNonce(senderAddress).longValue();
@@ -176,7 +179,7 @@ private TxQuota updateQuota(Transaction newTx, boolean isTxSource, CurrentContex
         long maxGasPerSecond = getMaxGasPerSecond(blockGasLimit.longValue());
         long maxQuota = getMaxQuota(maxGasPerSecond);
 
-        RskAddress address = isTxSource ? newTx.getSender() : newTx.getReceiveAddress();
+        RskAddress address = isTxSource ? newTx.getSender(signatureCache) : newTx.getReceiveAddress();
 
         TxQuota quotaForAddress = this.accountQuotas.get(address);
         if (quotaForAddress == null) {
@@ -206,7 +209,7 @@ private long getMaxQuota(long maxGasPerSecond) {
     }
 
     private double calculateConsumedVirtualGas(Transaction newTx, @Nullable Transaction replacedTx, CurrentContext currentContext) {
-        long accountNonce = currentContext.state.getNonce(newTx.getSender()).longValue();
+        long accountNonce = currentContext.state.getNonce(newTx.getSender(signatureCache)).longValue();
         long blockGasLimit = currentContext.bestBlock.getGasLimitAsInteger().longValue();
         long blockMinGasPrice = currentContext.bestBlock.getMinimumGasPrice().asBigInteger().longValue();
 
diff --git a/rskj-core/src/main/java/co/rsk/net/handler/txvalidator/TxValidatorIntrinsicGasLimitValidator.java b/rskj-core/src/main/java/co/rsk/net/handler/txvalidator/TxValidatorIntrinsicGasLimitValidator.java
index eab810cc340..6ac70394496 100644
--- a/rskj-core/src/main/java/co/rsk/net/handler/txvalidator/TxValidatorIntrinsicGasLimitValidator.java
+++ b/rskj-core/src/main/java/co/rsk/net/handler/txvalidator/TxValidatorIntrinsicGasLimitValidator.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.net.handler.txvalidator;
 
 import co.rsk.core.Coin;
@@ -35,15 +34,20 @@ public class TxValidatorIntrinsicGasLimitValidator implements TxValidatorStep {
 
     private final Constants constants;
     private final ActivationConfig activationConfig;
+    private final SignatureCache signatureCache;
 
-    public TxValidatorIntrinsicGasLimitValidator(Constants constants, ActivationConfig activationConfig) {
+    public TxValidatorIntrinsicGasLimitValidator(
+            Constants constants,
+            ActivationConfig activationConfig,
+            SignatureCache signatureCache) {
         this.constants = constants;
         this.activationConfig = activationConfig;
+        this.signatureCache = signatureCache;
     }
 
     @Override
     public TransactionValidationResult validate(Transaction tx, @Nullable AccountState state, BigInteger gasLimit, Coin minimumGasPrice, long bestBlockNumber, boolean isFreeTx) {
-        if (BigInteger.valueOf(tx.transactionCost(constants, activationConfig.forBlock(bestBlockNumber))).compareTo(tx.getGasLimitAsInteger()) <= 0) {
+        if (BigInteger.valueOf(tx.transactionCost(constants, activationConfig.forBlock(bestBlockNumber), signatureCache)).compareTo(tx.getGasLimitAsInteger()) <= 0) {
             return TransactionValidationResult.ok();
         }
 
diff --git a/rskj-core/src/main/java/co/rsk/peg/AddressBasedAuthorizer.java b/rskj-core/src/main/java/co/rsk/peg/AddressBasedAuthorizer.java
index 4d6e537c14e..3ef1101b0ce 100644
--- a/rskj-core/src/main/java/co/rsk/peg/AddressBasedAuthorizer.java
+++ b/rskj-core/src/main/java/co/rsk/peg/AddressBasedAuthorizer.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg;
 
 import co.rsk.core.RskAddress;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.crypto.ECKey;
 
@@ -48,8 +48,8 @@ public boolean isAuthorized(RskAddress sender) {
                 .anyMatch(address -> Arrays.equals(address, sender.getBytes()));
     }
 
-    public boolean isAuthorized(Transaction tx) {
-        return isAuthorized(tx.getSender());
+    public boolean isAuthorized(Transaction tx, SignatureCache signatureCache) {
+        return isAuthorized(tx.getSender(signatureCache));
     }
 
     public int getNumberOfAuthorizedKeys() {
diff --git a/rskj-core/src/main/java/co/rsk/peg/Bridge.java b/rskj-core/src/main/java/co/rsk/peg/Bridge.java
index ba7cd5003fa..26cfa216238 100644
--- a/rskj-core/src/main/java/co/rsk/peg/Bridge.java
+++ b/rskj-core/src/main/java/co/rsk/peg/Bridge.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg;
 
 import co.rsk.bitcoinj.core.*;
@@ -35,10 +34,7 @@
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.CallTransaction;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.db.BlockStore;
 import org.ethereum.db.ReceiptStore;
 import org.ethereum.util.ByteUtil;
@@ -228,20 +224,23 @@ public class Bridge extends PrecompiledContracts.PrecompiledContract {
 
     private final BiFunction<List<Sha256Hash>, Integer, MerkleBranch> merkleBranchFactory;
 
+    private final SignatureCache signatureCache;
+
     public Bridge(RskAddress contractAddress, Constants constants, ActivationConfig activationConfig,
-                  BridgeSupportFactory bridgeSupportFactory) {
-        this(contractAddress, constants, activationConfig, bridgeSupportFactory, MerkleBranch::new);
+                  BridgeSupportFactory bridgeSupportFactory, SignatureCache signatureCache) {
+        this(contractAddress, constants, activationConfig, bridgeSupportFactory, MerkleBranch::new, signatureCache);
     }
 
     @VisibleForTesting
     Bridge(RskAddress contractAddress, Constants constants, ActivationConfig activationConfig,
-           BridgeSupportFactory bridgeSupportFactory, BiFunction<List<Sha256Hash>, Integer, MerkleBranch> merkleBranchFactory) {
+           BridgeSupportFactory bridgeSupportFactory, BiFunction<List<Sha256Hash>, Integer, MerkleBranch> merkleBranchFactory, SignatureCache signatureCache) {
         this.bridgeSupportFactory = bridgeSupportFactory;
         this.contractAddress = contractAddress;
         this.constants = constants;
         this.bridgeConstants = constants.getBridgeConstants();
         this.activationConfig = activationConfig;
         this.merkleBranchFactory = merkleBranchFactory;
+        this.signatureCache = signatureCache;
     }
 
     @Override
@@ -251,7 +250,7 @@ public long getGasForData(byte[] data) {
             throw new NullPointerException();
         }
 
-        if (BridgeUtils.isFreeBridgeTx(rskTx, constants, activations)) {
+        if (BridgeUtils.isFreeBridgeTx(rskTx, constants, activations, signatureCache)) {
             return 0;
         }
 
@@ -1235,8 +1234,8 @@ public static BridgeMethods.BridgeMethodExecutor activeAndRetiringFederationOnly
         return (self, args) -> {
             Federation retiringFederation = self.bridgeSupport.getRetiringFederation();
 
-            if (!BridgeUtils.isFromFederateMember(self.rskTx, self.bridgeSupport.getActiveFederation())
-                    && (retiringFederation == null || !BridgeUtils.isFromFederateMember(self.rskTx, retiringFederation))) {
+            if (!BridgeUtils.isFromFederateMember(self.rskTx, self.bridgeSupport.getActiveFederation(), self.signatureCache)
+                    && (retiringFederation == null || !BridgeUtils.isFromFederateMember(self.rskTx, retiringFederation, self.signatureCache))) {
                 String errorMessage = String.format("Sender is not part of the active or retiring federations, so he is not enabled to call the function '%s'",funcName);
                 logger.warn(errorMessage);
                 throw new VMException(errorMessage);
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
index 71ef75c2e3d..f4b8e20aec2 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg;
 
 import co.rsk.bitcoinj.core.Address;
@@ -87,6 +86,7 @@
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
 import org.ethereum.core.Block;
 import org.ethereum.core.Repository;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.crypto.HashUtil;
@@ -172,6 +172,8 @@ public class BridgeSupport {
     private final org.ethereum.core.Block rskExecutionBlock;
     private final ActivationConfig.ForBlock activations;
 
+    private final SignatureCache signatureCache;
+
     protected enum TxType {
         PEGIN,
         PEGOUT,
@@ -190,7 +192,8 @@ public BridgeSupport(
             Context btcContext,
             FederationSupport federationSupport,
             BtcBlockStoreWithCache.Factory btcBlockStoreFactory,
-            ActivationConfig.ForBlock activations) {
+            ActivationConfig.ForBlock activations,
+            SignatureCache signatureCache) {
         this.rskRepository = repository;
         this.provider = provider;
         this.rskExecutionBlock = executionBlock;
@@ -202,6 +205,7 @@ public BridgeSupport(
         this.federationSupport = federationSupport;
         this.btcBlockStoreFactory = btcBlockStoreFactory;
         this.activations = activations;
+        this.signatureCache = signatureCache;
     }
 
     public List<ProgramSubtrace> getSubtraces() {
@@ -774,7 +778,7 @@ private void saveNewUTXOs(BtcTransaction btcTx) throws IOException {
      */
     public void releaseBtc(Transaction rskTx) throws IOException {
         Coin value = rskTx.getValue().toBitcoin();
-        final RskAddress senderAddress = rskTx.getSender();
+        final RskAddress senderAddress = rskTx.getSender(signatureCache);
         //as we can't send btc from contracts we want to send them back to the senderAddressStr
         if (BridgeUtils.isContractTx(rskTx)) {
             logger.trace("Contract {} tried to release funds. Release is just allowed from standard accounts.", rskTx);
@@ -864,7 +868,7 @@ private void requestRelease(Address destinationAddress, Coin value, Transaction
             if (activations.isActive(ConsensusRule.RSKIP185)) {
                 refundAndEmitRejectEvent(
                     value,
-                    rskTx.getSender(),
+                    rskTx.getSender(signatureCache),
                     optionalRejectedPegoutReason.get()
                 );
             }
@@ -876,7 +880,7 @@ private void requestRelease(Address destinationAddress, Coin value, Transaction
             }
 
             if (activations.isActive(ConsensusRule.RSKIP185)) {
-                eventLogger.logReleaseBtcRequestReceived(rskTx.getSender().toHexString(), destinationAddress, value);
+                eventLogger.logReleaseBtcRequestReceived(rskTx.getSender(signatureCache).toHexString(), destinationAddress, value);
             }
             logger.info("releaseBtc successful to {}. Tx {}. Value {}.", destinationAddress, rskTx, value);
         }
@@ -2104,7 +2108,7 @@ public Integer voteFederationChange(Transaction tx, ABICallSpec callSpec) throws
         AddressBasedAuthorizer authorizer = bridgeConstants.getFederationChangeAuthorizer();
 
         // Must be authorized to vote (checking for signature)
-        if (!authorizer.isAuthorized(tx)) {
+        if (!authorizer.isAuthorized(tx, signatureCache)) {
             return FEDERATION_CHANGE_GENERIC_ERROR_CODE;
         }
 
@@ -2124,7 +2128,7 @@ public Integer voteFederationChange(Transaction tx, ABICallSpec callSpec) throws
 
         ABICallElection election = provider.getFederationElection(authorizer);
         // Register the vote. It is expected to succeed, since all previous checks succeeded
-        if (!election.vote(callSpec, tx.getSender())) {
+        if (!election.vote(callSpec, tx.getSender(signatureCache))) {
             logger.warn("Unexpected federation change vote failure");
             return FEDERATION_CHANGE_GENERIC_ERROR_CODE;
         }
@@ -2369,7 +2373,7 @@ private Integer addLockWhitelistAddress(Transaction tx, LockWhitelistEntry entry
     private boolean isLockWhitelistChangeAuthorized(Transaction tx) {
         AddressBasedAuthorizer authorizer = bridgeConstants.getLockWhitelistChangeAuthorizer();
 
-        return authorizer.isAuthorized(tx);
+        return authorizer.isAuthorized(tx, signatureCache);
     }
 
     /**
@@ -2421,7 +2425,7 @@ public Coin getMinimumPeginTxValue() {
      */
     public Integer voteFeePerKbChange(Transaction tx, Coin feePerKb) {
         AddressBasedAuthorizer authorizer = bridgeConstants.getFeePerKbChangeAuthorizer();
-        if (!authorizer.isAuthorized(tx)) {
+        if (!authorizer.isAuthorized(tx, signatureCache)) {
             return FEE_PER_KB_GENERIC_ERROR_CODE;
         }
 
@@ -2435,7 +2439,7 @@ public Integer voteFeePerKbChange(Transaction tx, Coin feePerKb) {
 
         ABICallElection feePerKbElection = provider.getFeePerKbElection(authorizer);
         ABICallSpec feeVote = new ABICallSpec("setFeePerKb", new byte[][]{BridgeSerializationUtils.serializeCoin(feePerKb)});
-        boolean successfulVote = feePerKbElection.vote(feeVote, tx.getSender());
+        boolean successfulVote = feePerKbElection.vote(feeVote, tx.getSender(signatureCache));
         if (!successfulVote) {
             return -1;
         }
@@ -2517,8 +2521,8 @@ public Optional<Script> getActivePowpegRedeemScript() {
     public boolean increaseLockingCap(Transaction tx, Coin newCap) {
         // Only pre configured addresses can modify locking cap
         AddressBasedAuthorizer authorizer = bridgeConstants.getIncreaseLockingCapAuthorizer();
-        if (!authorizer.isAuthorized(tx)) {
-            logger.warn("not authorized address tried to increase locking cap. Address: {}", tx.getSender());
+        if (!authorizer.isAuthorized(tx, signatureCache)) {
+            logger.warn("not authorized address tried to increase locking cap. Address: {}", tx.getSender(signatureCache));
             return false;
         }
         // new locking cap must be bigger than current locking cap
@@ -2684,10 +2688,12 @@ public BigInteger registerFlyoverBtcTransaction(
             return BigInteger.valueOf(FlyoverTxResponseCodes.UNPROCESSABLE_TX_NOT_CONTRACT_ERROR.value());
         }
 
-        if (!rskTx.getSender().equals(lbcAddress)) {
+        RskAddress sender = rskTx.getSender(signatureCache);
+
+        if (!sender.equals(lbcAddress)) {
             logger.debug(
                 "[registerFlyoverBtcTransaction] Expected sender to be the same as lbcAddress. (sender: {}) (lbcAddress:{})",
-                rskTx.getSender(),
+                sender,
                 lbcAddress
             );
             return BigInteger.valueOf(FlyoverTxResponseCodes.UNPROCESSABLE_TX_INVALID_SENDER_ERROR.value());
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java
index 95f64b8a18b..f0c7e65b7ea 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg;
 
 import co.rsk.bitcoinj.core.Context;
@@ -33,6 +32,7 @@
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
 import org.ethereum.core.Block;
 import org.ethereum.core.Repository;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.vm.LogInfo;
 
 /**
@@ -43,12 +43,16 @@ public class BridgeSupportFactory {
     private final Factory btcBlockStoreFactory;
     private final BridgeConstants bridgeConstants;
     private final ActivationConfig activationConfig;
+    private final SignatureCache signatureCache;
 
     public BridgeSupportFactory(Factory btcBlockStoreFactory,
-            BridgeConstants bridgeConstants, ActivationConfig activationConfig) {
+                                BridgeConstants bridgeConstants,
+                                ActivationConfig activationConfig,
+                                SignatureCache signatureCache) {
         this.btcBlockStoreFactory = btcBlockStoreFactory;
         this.bridgeConstants = bridgeConstants;
         this.activationConfig = activationConfig;
+        this.signatureCache = signatureCache;
     }
 
     public BridgeSupport newInstance(Repository repository, Block executionBlock,
@@ -70,9 +74,9 @@ public BridgeSupport newInstance(Repository repository, Block executionBlock,
             eventLogger = null;
         } else {
             if (activations.isActive(ConsensusRule.RSKIP146)) {
-                eventLogger = new BridgeEventLoggerImpl(bridgeConstants, activations, logs);
+                eventLogger = new BridgeEventLoggerImpl(bridgeConstants, activations, logs, signatureCache);
             } else {
-                eventLogger = new BrigeEventLoggerLegacyImpl(bridgeConstants, activations, logs);
+                eventLogger = new BrigeEventLoggerLegacyImpl(bridgeConstants, activations, logs, signatureCache);
             }
         }
 
@@ -90,7 +94,8 @@ public BridgeSupport newInstance(Repository repository, Block executionBlock,
                 btcContext,
                 federationSupport,
                 btcBlockStoreFactory,
-                activations
+                activations,
+                signatureCache
         );
     }
 }
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeUtils.java b/rskj-core/src/main/java/co/rsk/peg/BridgeUtils.java
index 73a6db41965..a2898de6efd 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeUtils.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeUtils.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg;
 
 import co.rsk.bitcoinj.core.Address;
@@ -48,6 +47,7 @@
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.PrecompiledContracts;
@@ -649,7 +649,7 @@ public static Address recoverBtcAddressFromEthTransaction(org.ethereum.core.Tran
         return BtcECKey.fromPublicOnly(pubKey).toAddress(networkParameters);
     }
 
-    public static boolean isFreeBridgeTx(Transaction rskTx, Constants constants, ActivationConfig.ForBlock activations) {
+    public static boolean isFreeBridgeTx(Transaction rskTx, Constants constants, ActivationConfig.ForBlock activations, SignatureCache signatureCache) {
         RskAddress receiveAddress = rskTx.getReceiveAddress();
         if (receiveAddress.equals(RskAddress.nullAddress())) {
             return false;
@@ -664,10 +664,10 @@ public static boolean isFreeBridgeTx(Transaction rskTx, Constants constants, Act
                !activations.isActive(ConsensusRule.ARE_BRIDGE_TXS_PAID) &&
                rskTx.acceptTransactionSignature(constants.getChainId()) &&
                (
-                       isFromFederateMember(rskTx, bridgeConstants.getGenesisFederation()) ||
-                       isFromFederationChangeAuthorizedSender(rskTx, bridgeConstants) ||
-                       isFromLockWhitelistChangeAuthorizedSender(rskTx, bridgeConstants) ||
-                       isFromFeePerKbChangeAuthorizedSender(rskTx, bridgeConstants)
+                       isFromFederateMember(rskTx, bridgeConstants.getGenesisFederation(), signatureCache) ||
+                       isFromFederationChangeAuthorizedSender(rskTx, bridgeConstants, signatureCache) ||
+                       isFromLockWhitelistChangeAuthorizedSender(rskTx, bridgeConstants, signatureCache) ||
+                       isFromFeePerKbChangeAuthorizedSender(rskTx, bridgeConstants, signatureCache)
                );
     }
 
@@ -681,8 +681,8 @@ public static boolean isContractTx(Transaction rskTx) {
         return rskTx.getClass() == org.ethereum.vm.program.InternalTransaction.class;
     }
 
-    public static boolean isFromFederateMember(org.ethereum.core.Transaction rskTx, Federation federation) {
-        return federation.hasMemberWithRskAddress(rskTx.getSender().getBytes());
+    public static boolean isFromFederateMember(org.ethereum.core.Transaction rskTx, Federation federation, SignatureCache signatureCache) {
+        return federation.hasMemberWithRskAddress(rskTx.getSender(signatureCache).getBytes());
     }
 
     public static Coin getCoinFromBigInteger(BigInteger value) throws BridgeIllegalArgumentException {
@@ -696,19 +696,19 @@ public static Coin getCoinFromBigInteger(BigInteger value) throws BridgeIllegalA
         }
     }
 
-    private static boolean isFromFederationChangeAuthorizedSender(org.ethereum.core.Transaction rskTx, BridgeConstants bridgeConfiguration) {
+    private static boolean isFromFederationChangeAuthorizedSender(org.ethereum.core.Transaction rskTx, BridgeConstants bridgeConfiguration, SignatureCache signatureCache) {
         AddressBasedAuthorizer authorizer = bridgeConfiguration.getFederationChangeAuthorizer();
-        return authorizer.isAuthorized(rskTx);
+        return authorizer.isAuthorized(rskTx, signatureCache);
     }
 
-    private static boolean isFromLockWhitelistChangeAuthorizedSender(org.ethereum.core.Transaction rskTx, BridgeConstants bridgeConfiguration) {
+    private static boolean isFromLockWhitelistChangeAuthorizedSender(org.ethereum.core.Transaction rskTx, BridgeConstants bridgeConfiguration, SignatureCache signatureCache) {
         AddressBasedAuthorizer authorizer = bridgeConfiguration.getLockWhitelistChangeAuthorizer();
-        return authorizer.isAuthorized(rskTx);
+        return authorizer.isAuthorized(rskTx, signatureCache);
     }
 
-    private static boolean isFromFeePerKbChangeAuthorizedSender(org.ethereum.core.Transaction rskTx, BridgeConstants bridgeConfiguration) {
+    private static boolean isFromFeePerKbChangeAuthorizedSender(org.ethereum.core.Transaction rskTx, BridgeConstants bridgeConfiguration, SignatureCache signatureCache) {
         AddressBasedAuthorizer authorizer = bridgeConfiguration.getFeePerKbChangeAuthorizer();
-        return authorizer.isAuthorized(rskTx);
+        return authorizer.isAuthorized(rskTx, signatureCache);
     }
 
     public static boolean validateHeightAndConfirmations(int height, int btcBestChainHeight, int acceptableConfirmationsAmount, Sha256Hash btcTxHash) throws Exception {
diff --git a/rskj-core/src/main/java/co/rsk/peg/utils/BridgeEventLoggerImpl.java b/rskj-core/src/main/java/co/rsk/peg/utils/BridgeEventLoggerImpl.java
index b84ee82a523..3da68488d93 100644
--- a/rskj-core/src/main/java/co/rsk/peg/utils/BridgeEventLoggerImpl.java
+++ b/rskj-core/src/main/java/co/rsk/peg/utils/BridgeEventLoggerImpl.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg.utils;
 
 import co.rsk.bitcoinj.core.*;
@@ -28,6 +27,7 @@
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
 import org.ethereum.core.Block;
 import org.ethereum.core.CallTransaction;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.util.ByteUtil;
@@ -50,13 +50,16 @@ public class BridgeEventLoggerImpl implements BridgeEventLogger {
 
     private final BridgeConstants bridgeConstants;
 
+    private final SignatureCache signatureCache;
+
     private List<LogInfo> logs;
 
     private ActivationConfig.ForBlock activations;
 
-    public BridgeEventLoggerImpl(BridgeConstants bridgeConstants, ActivationConfig.ForBlock activations, List<LogInfo> logs) {
+    public BridgeEventLoggerImpl(BridgeConstants bridgeConstants, ActivationConfig.ForBlock activations, List<LogInfo> logs, SignatureCache signatureCache) {
         this.activations = activations;
         this.bridgeConstants = bridgeConstants;
+        this.signatureCache = signatureCache;
         this.logs = logs;
     }
 
@@ -65,7 +68,7 @@ public void logUpdateCollections(Transaction rskTx) {
         CallTransaction.Function event = BridgeEvents.UPDATE_COLLECTIONS.getEvent();
         byte[][] encodedTopicsInBytes = event.encodeEventTopics();
         List<DataWord> encodedTopics = LogInfo.byteArrayToList(encodedTopicsInBytes);
-        byte[] encodedData = event.encodeEventData(rskTx.getSender().toString());
+        byte[] encodedData = event.encodeEventData(rskTx.getSender(signatureCache).toString());
 
         this.logs.add(new LogInfo(BRIDGE_CONTRACT_ADDRESS, encodedTopics, encodedData));
     }
@@ -196,6 +199,7 @@ private void logReleaseBtcRequestReceived(String sender, String btcDestinationAd
         byte[][] encodedTopicsInBytes = event.encodeEventTopics(sender);
         List<DataWord> encodedTopics = LogInfo.byteArrayToList(encodedTopicsInBytes);
         byte[] encodedData = event.encodeEventData(btcDestinationAddress, amount.getValue());
+
         this.logs.add(new LogInfo(BRIDGE_CONTRACT_ADDRESS, encodedTopics, encodedData));
     }
 
diff --git a/rskj-core/src/main/java/co/rsk/peg/utils/BrigeEventLoggerLegacyImpl.java b/rskj-core/src/main/java/co/rsk/peg/utils/BrigeEventLoggerLegacyImpl.java
index 1b45029f5a5..1fc1ecdc380 100644
--- a/rskj-core/src/main/java/co/rsk/peg/utils/BrigeEventLoggerLegacyImpl.java
+++ b/rskj-core/src/main/java/co/rsk/peg/utils/BrigeEventLoggerLegacyImpl.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of RskJ
+ * Copyright (C) 2017 RSK Labs Ltd.
+ * (derived from ethereumJ library, Copyright (c) 2016 <ether.camp>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package co.rsk.peg.utils;
 
 import co.rsk.bitcoinj.core.*;
@@ -8,6 +26,7 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
 import org.ethereum.core.Block;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.util.RLP;
 import org.ethereum.vm.DataWord;
@@ -32,11 +51,13 @@ public class BrigeEventLoggerLegacyImpl implements BridgeEventLogger {
 
     private final BridgeConstants bridgeConstants;
     private final ActivationConfig.ForBlock activations;
+    private final SignatureCache signatureCache;
     private List<LogInfo> logs;
 
-    public BrigeEventLoggerLegacyImpl(BridgeConstants bridgeConstants, ActivationConfig.ForBlock activations, List<LogInfo> logs) {
+    public BrigeEventLoggerLegacyImpl(BridgeConstants bridgeConstants, ActivationConfig.ForBlock activations, List<LogInfo> logs, SignatureCache signatureCache) {
         this.bridgeConstants = bridgeConstants;
         this.activations = activations;
+        this.signatureCache = signatureCache;
         this.logs = logs;
     }
 
@@ -50,7 +71,7 @@ public void logUpdateCollections(Transaction rskTx) {
         this.logs.add(
             new LogInfo(BRIDGE_CONTRACT_ADDRESS,
                 Collections.singletonList(Bridge.UPDATE_COLLECTIONS_TOPIC),
-                RLP.encodeElement(rskTx.getSender().getBytes())
+                RLP.encodeElement(rskTx.getSender(signatureCache).getBytes())
             )
         );
     }
diff --git a/rskj-core/src/main/java/co/rsk/remasc/RemascTransaction.java b/rskj-core/src/main/java/co/rsk/remasc/RemascTransaction.java
index 2841c6e9c0e..a0d084d6001 100644
--- a/rskj-core/src/main/java/co/rsk/remasc/RemascTransaction.java
+++ b/rskj-core/src/main/java/co/rsk/remasc/RemascTransaction.java
@@ -20,6 +20,7 @@
 
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.PrecompiledContracts;
@@ -87,7 +88,10 @@ public RemascTransaction(long blockNumber) {
     }
 
     @Override
-    public long transactionCost(Constants constants, ActivationConfig.ForBlock activations) {
+    public long transactionCost(
+            Constants constants,
+            ActivationConfig.ForBlock activations,
+            SignatureCache signatureCache) {
         // RemascTransaction does not pay any fees
         return 0;
     }
diff --git a/rskj-core/src/main/java/co/rsk/rpc/Web3RskImpl.java b/rskj-core/src/main/java/co/rsk/rpc/Web3RskImpl.java
index b3836be9cba..7984f5b15e5 100644
--- a/rskj-core/src/main/java/co/rsk/rpc/Web3RskImpl.java
+++ b/rskj-core/src/main/java/co/rsk/rpc/Web3RskImpl.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.rpc;
 
 import co.rsk.config.RskSystemProperties;
@@ -40,6 +39,7 @@
 import org.ethereum.core.Block;
 import org.ethereum.core.BlockHeader;
 import org.ethereum.core.Blockchain;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.db.BlockStore;
 import org.ethereum.db.ReceiptStore;
@@ -96,11 +96,12 @@ public Web3RskImpl(
             BuildInfo buildInfo,
             BlocksBloomStore blocksBloomStore,
             Web3InformationRetriever retriever,
-            SyncProcessor syncProcessor) {
+            SyncProcessor syncProcessor,
+            SignatureCache signatureCache) {
             super(eth, blockchain, blockStore, receiptStore, properties, minerClient, minerServer,
                     personalModule, ethModule, evmModule, txPoolModule, mnrModule, debugModule, traceModule, rskModule,
                     channelManager, peerScoringManager, peerServer, nodeBlockProcessor,
-                    hashRateCalculator, configCapabilities, buildInfo, blocksBloomStore, retriever, syncProcessor);
+                    hashRateCalculator, configCapabilities, buildInfo, blocksBloomStore, retriever, syncProcessor, signatureCache);
 
         this.networkStateExporter = networkStateExporter;
         this.blockStore = blockStore;
diff --git a/rskj-core/src/main/java/co/rsk/rpc/modules/trace/TraceModuleImpl.java b/rskj-core/src/main/java/co/rsk/rpc/modules/trace/TraceModuleImpl.java
index 02b800781cc..2f0789f8c6f 100644
--- a/rskj-core/src/main/java/co/rsk/rpc/modules/trace/TraceModuleImpl.java
+++ b/rskj-core/src/main/java/co/rsk/rpc/modules/trace/TraceModuleImpl.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.rpc.modules.trace;
 
 import co.rsk.config.VmConfig;
@@ -27,6 +26,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.ethereum.core.Block;
 import org.ethereum.core.Blockchain;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.core.TransactionReceipt;
 import org.ethereum.db.BlockStore;
@@ -63,17 +63,21 @@ public class TraceModuleImpl implements TraceModule {
     private final BlockExecutor blockExecutor;
     private final ExecutionBlockRetriever executionBlockRetriever;
 
+    private final SignatureCache signatureCache;
+
     public TraceModuleImpl(
             Blockchain blockchain,
             BlockStore blockStore,
             ReceiptStore receiptStore,
             BlockExecutor blockExecutor,
-            ExecutionBlockRetriever executionBlockRetriever) {
+            ExecutionBlockRetriever executionBlockRetriever,
+            SignatureCache signatureCache) {
         this.blockchain = blockchain;
         this.blockStore = blockStore;
         this.receiptStore = receiptStore;
         this.blockExecutor = blockExecutor;
         this.executionBlockRetriever = executionBlockRetriever;
+        this.signatureCache = signatureCache;
     }
 
     @Override
@@ -232,7 +236,7 @@ private List<TransactionTrace> buildBlockTraces(Block block, TraceFilterRequest
 
                 if (traceFilterRequest.getFromAddress() != null && !traceFilterRequest.getFromAddress().isEmpty()) {
                     List<RskAddress> addresses = traceFilterRequest.getFromAddressAsRskAddresses();
-                    txStream = txStream.filter(tx -> tx.getSender().getBytes().length > 0 && addresses.contains(tx.getSender()));
+                    txStream = txStream.filter(tx -> tx.getSender(signatureCache).getBytes().length > 0 && addresses.contains(tx.getSender(signatureCache)));
                 }
 
                 if (traceFilterRequest.getToAddress() != null && !traceFilterRequest.getToAddress().isEmpty()) {
diff --git a/rskj-core/src/main/java/co/rsk/rpc/modules/txpool/TxPoolModuleImpl.java b/rskj-core/src/main/java/co/rsk/rpc/modules/txpool/TxPoolModuleImpl.java
index 5f46ca1b9e3..28ddbe4ba7e 100644
--- a/rskj-core/src/main/java/co/rsk/rpc/modules/txpool/TxPoolModuleImpl.java
+++ b/rskj-core/src/main/java/co/rsk/rpc/modules/txpool/TxPoolModuleImpl.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.rpc.modules.txpool;
 
 import java.math.BigInteger;
@@ -25,6 +24,7 @@
 import java.util.Map;
 import java.util.function.Function;
 
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.core.TransactionPool;
 
@@ -43,9 +43,12 @@ public class TxPoolModuleImpl implements TxPoolModule {
     private final JsonNodeFactory jsonNodeFactory;
     private final TransactionPool transactionPool;
 
-    public TxPoolModuleImpl(TransactionPool transactionPool) {
+    private final SignatureCache signatureCache;
+
+    public TxPoolModuleImpl(TransactionPool transactionPool, SignatureCache signatureCache) {
         this.transactionPool = transactionPool;
         jsonNodeFactory = JsonNodeFactory.instance;
+        this.signatureCache = signatureCache;
     }
 
     /**
@@ -62,8 +65,7 @@ public JsonNode content() {
         Map<RskAddress, Map<BigInteger, List<Transaction>>> queuedGrouped = groupTransactions(transactionPool.getQueuedTransactions());
         contentProps.put(PENDING, serializeTransactions(pendingGrouped, this::fullSerializer));
         contentProps.put(QUEUED, serializeTransactions(queuedGrouped, this::fullSerializer));
-        JsonNode node = jsonNodeFactory.objectNode().setAll(contentProps);
-        return node;
+        return jsonNodeFactory.objectNode().setAll(contentProps);
     }
 
     private JsonNode serializeTransactions(
@@ -91,7 +93,7 @@ private JsonNode fullSerializer(Transaction tx) {
         txNode.putNull("blockNumber");
         txNode.putNull("transactionIndex");
 
-        txNode.put("from", HexUtils.toJsonHex(tx.getSender().getBytes()));
+        txNode.put("from", HexUtils.toJsonHex(tx.getSender(signatureCache).getBytes()));
         txNode.put("gas", HexUtils.toQuantityJsonHex(tx.getGasLimitAsInteger()));
         txNode.put("gasPrice", HexUtils.toJsonHex(tx.getGasPrice().getBytes()));
         txNode.put("hash", HexUtils.toJsonHex(tx.getHash().toHexString()));
@@ -115,10 +117,10 @@ private JsonNode summarySerializer(Transaction tx) {
     private Map<RskAddress, Map<BigInteger, List<Transaction>>> groupTransactions(List<Transaction> transactions) {
         Map<RskAddress, Map<BigInteger, List<Transaction>>> groupedTransactions = new HashMap<>();
         for (Transaction tx : transactions){
-            Map<BigInteger, List<Transaction>> txsBySender = groupedTransactions.get(tx.getSender());
+            Map<BigInteger, List<Transaction>> txsBySender = groupedTransactions.get(tx.getSender(signatureCache));
             if (txsBySender == null){
                 txsBySender = new HashMap<>();
-                groupedTransactions.put(tx.getSender(), txsBySender);
+                groupedTransactions.put(tx.getSender(signatureCache), txsBySender);
             }
             List<Transaction> txsByNonce = txsBySender.get(tx.getNonceAsInteger());
             if (txsByNonce == null){
@@ -146,8 +148,7 @@ public JsonNode inspect() {
         Map<RskAddress, Map<BigInteger, List<Transaction>>> queuedGrouped = groupTransactions(transactionPool.getQueuedTransactions());
         contentProps.put(PENDING, serializeTransactions(pendingGrouped, this::summarySerializer));
         contentProps.put(QUEUED, serializeTransactions(queuedGrouped, this::summarySerializer));
-        JsonNode node = jsonNodeFactory.objectNode().setAll(contentProps);
-        return node;
+        return jsonNodeFactory.objectNode().setAll(contentProps);
     }
 
     /**
@@ -162,7 +163,6 @@ public JsonNode status() {
         Map<String, JsonNode> txProps = new HashMap<>();
         txProps.put(PENDING, jsonNodeFactory.numberNode(transactionPool.getPendingTransactions().size()));
         txProps.put(QUEUED, jsonNodeFactory.numberNode(transactionPool.getQueuedTransactions().size()));
-        JsonNode node = jsonNodeFactory.objectNode().setAll(txProps);
-        return node;
+        return jsonNodeFactory.objectNode().setAll(txProps);
     }
 }
\ No newline at end of file
diff --git a/rskj-core/src/main/java/co/rsk/validators/BlockTxsFieldsValidationRule.java b/rskj-core/src/main/java/co/rsk/validators/BlockTxsFieldsValidationRule.java
index 736b5d8554c..9d4656b03d7 100644
--- a/rskj-core/src/main/java/co/rsk/validators/BlockTxsFieldsValidationRule.java
+++ b/rskj-core/src/main/java/co/rsk/validators/BlockTxsFieldsValidationRule.java
@@ -19,6 +19,7 @@
 package co.rsk.validators;
 
 import org.ethereum.core.Block;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,6 +32,12 @@
 public class BlockTxsFieldsValidationRule implements BlockParentDependantValidationRule {
     private static final Logger logger = LoggerFactory.getLogger("blockvalidator");
 
+    private final SignatureCache signatureCache;
+    
+    public BlockTxsFieldsValidationRule(SignatureCache signatureCache) {
+        this.signatureCache = signatureCache;
+    }
+
     @Override
     public boolean isValid(Block block, Block parent) {
         if (block == null) {
@@ -41,7 +48,7 @@ public boolean isValid(Block block, Block parent) {
         List<Transaction> txs = block.getTransactionsList();
         for (Transaction tx : txs) {
             try {
-                tx.verify();
+                tx.verify(signatureCache);
             } catch (RuntimeException e) {
                 logger.warn("Unable to verify transaction", e);
                 return false;
diff --git a/rskj-core/src/main/java/co/rsk/validators/BlockTxsValidationRule.java b/rskj-core/src/main/java/co/rsk/validators/BlockTxsValidationRule.java
index 16ec790f0ca..bf2cb042ae6 100644
--- a/rskj-core/src/main/java/co/rsk/validators/BlockTxsValidationRule.java
+++ b/rskj-core/src/main/java/co/rsk/validators/BlockTxsValidationRule.java
@@ -74,7 +74,7 @@ public boolean isValid(Block block, Block parent) {
 
         for (Transaction tx : txs) {
             try {
-                tx.verify();
+                tx.verify(signatureCache);
             } catch (RuntimeException e) {
                 logger.warn("Unable to verify transaction", e);
                 return false;
diff --git a/rskj-core/src/main/java/org/ethereum/core/Transaction.java b/rskj-core/src/main/java/org/ethereum/core/Transaction.java
index 36096fd7bfa..245022dd134 100644
--- a/rskj-core/src/main/java/org/ethereum/core/Transaction.java
+++ b/rskj-core/src/main/java/org/ethereum/core/Transaction.java
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.core;
 
 import co.rsk.core.Coin;
@@ -196,9 +195,9 @@ private byte getRealV(byte v) {
     // There was a method called NEW_getTransactionCost that implemented this alternative solution:
     // "return (this.isContractCreation() ? GasCost.TRANSACTION_CREATE_CONTRACT : GasCost.TRANSACTION)
     //         + zeroVals * GasCost.TX_ZERO_DATA + nonZeroes * GasCost.TX_NO_ZERO_DATA;"
-    public long transactionCost(Constants constants, ActivationConfig.ForBlock activations) {
+    public long transactionCost(Constants constants, ActivationConfig.ForBlock activations, SignatureCache signatureCache) {
         // Federators txs to the bridge are free during system setup
-        if (BridgeUtils.isFreeBridgeTx(this, constants, activations)) {
+        if (BridgeUtils.isFreeBridgeTx(this, constants, activations, signatureCache)) {
             return 0;
         }
 
@@ -208,11 +207,11 @@ public long transactionCost(Constants constants, ActivationConfig.ForBlock activ
         return (this.isContractCreation() ? GasCost.TRANSACTION_CREATE_CONTRACT : GasCost.TRANSACTION) + zeroVals * GasCost.TX_ZERO_DATA + nonZeroes * GasCost.TX_NO_ZERO_DATA;
     }
 
-    public void verify() {
-        validate();
+    public void verify(SignatureCache signatureCache) {
+        validate(signatureCache);
     }
 
-    private void validate() {
+    private void validate(SignatureCache signatureCache) {
         if (getNonce().length > DATAWORD_LENGTH) {
             throw new RuntimeException("Nonce is not valid");
         }
@@ -235,7 +234,8 @@ private void validate() {
             if (BigIntegers.asUnsignedByteArray(signature.getS()).length > DATAWORD_LENGTH) {
                 throw new RuntimeException("Signature S is not valid");
             }
-            if (getSender().getBytes() != null && getSender().getBytes().length != Constants.getMaxAddressByteLength()) {
+            RskAddress senderAddress = getSender(signatureCache);
+            if (senderAddress.getBytes() != null && senderAddress.getBytes().length != Constants.getMaxAddressByteLength()) {
                 throw new RuntimeException("Sender is not valid");
             }
         }
@@ -371,12 +371,19 @@ public ECKey getKey() {
         return key;
     }
 
+    /**
+     * Returns sender's Address
+     * <p>
+     * Usage of this method should be avoided in favor of getSender(SignatureCache signatureCache)
+     * as it tries to get the data from the cache first, improving performance.
+     *
+     * @return RskAddress the sender's Address
+     */
     public synchronized RskAddress getSender() {
         if (sender != null) {
             return sender;
         }
 
-
         Metric metric = profiler.start(Profiler.PROFILING_TYPE.KEY_RECOV_FROM_SIG);
         try {
             ECKey key = Secp256k1.getInstance().signatureToKey(getRawHash().getBytes(), getSignature());
@@ -399,7 +406,11 @@ public synchronized RskAddress getSender(SignatureCache signatureCache) {
 
         sender = signatureCache.getSender(this);
 
-        return sender;
+        if (sender != null) {
+            return sender;
+        }
+
+        return getSender();
     }
 
     public byte getChainId() {
diff --git a/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java b/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java
index fc0e3426b6f..45caa37c5af 100644
--- a/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java
+++ b/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.core;
 
 import co.rsk.config.VmConfig;
@@ -97,7 +96,7 @@ public class TransactionExecutor {
     private long basicTxCost = 0;
     private List<LogInfo> logs = null;
     private final Set<DataWord> deletedAccounts;
-    private SignatureCache signatureCache;
+    private final SignatureCache signatureCache;
 
     private boolean localCall = false;
 
@@ -150,7 +149,7 @@ public boolean executeTransaction() {
      * set readyToExecute = true
      */
     private boolean init() {
-        basicTxCost = tx.transactionCost(constants, activations);
+        basicTxCost = tx.transactionCost(constants, activations, signatureCache);
 
         if (localCall) {
             return true;
@@ -176,7 +175,7 @@ private boolean init() {
             totalCost = totalCost.add(txGasCost);
         }
 
-        Coin senderBalance = track.getBalance(tx.getSender());
+        Coin senderBalance = track.getBalance(tx.getSender(signatureCache));
 
         if (!isCovers(senderBalance, totalCost)) {
 
@@ -229,7 +228,7 @@ private boolean nonceIsValid() {
 
         if (isNotEqual(reqNonce, txNonce)) {
             if (logger.isWarnEnabled()) {
-                logger.warn("Invalid nonce: sender {}, required: {} , tx.nonce: {}, tx {}", tx.getSender(), reqNonce, txNonce, tx.getHash());
+                logger.warn("Invalid nonce: sender {}, required: {} , tx.nonce: {}, tx {}", tx.getSender(signatureCache), reqNonce, txNonce, tx.getHash());
                 logger.warn("Transaction Data: {}", tx);
                 logger.warn("Tx Included in the following block: {}", this.executionBlock.getShortDescr());
             }
@@ -270,11 +269,11 @@ private void execute() {
 
         if (!localCall) {
 
-            track.increaseNonce(tx.getSender());
+            track.increaseNonce(tx.getSender(signatureCache));
 
             long txGasLimit = GasCost.toGas(tx.getGasLimit());
             Coin txGasCost = tx.getGasPrice().multiply(BigInteger.valueOf(txGasLimit));
-            track.addBalance(tx.getSender(), txGasCost.negate());
+            track.addBalance(tx.getSender(signatureCache), txGasCost.negate());
 
             logger.trace("Paying: txGasCost: [{}], gasPrice: [{}], gasLimit: [{}]", txGasCost, tx.getGasPrice(), txGasLimit);
         }
@@ -353,16 +352,16 @@ private void call() {
                 result.spendGas(basicTxCost);
             } else {
                 ProgramInvoke programInvoke =
-                        programInvokeFactory.createProgramInvoke(tx, txindex, executionBlock, cacheTrack, blockStore);
+                        programInvokeFactory.createProgramInvoke(tx, txindex, executionBlock, cacheTrack, blockStore, signatureCache);
 
                 this.vm = new VM(vmConfig, precompiledContracts);
-                this.program = new Program(vmConfig, precompiledContracts, blockFactory, activations, code, programInvoke, tx, deletedAccounts);
+                this.program = new Program(vmConfig, precompiledContracts, blockFactory, activations, code, programInvoke, tx, deletedAccounts, signatureCache);
             }
         }
 
         if (result.getException() == null) {
             Coin endowment = tx.getValue();
-            cacheTrack.transfer(tx.getSender(), targetAddress, endowment);
+            cacheTrack.transfer(tx.getSender(signatureCache), targetAddress, endowment);
         }
     }
 
@@ -376,10 +375,10 @@ private void create() {
             // storage. It doesn't even call setupContract() to setup a storage root
         } else {
             cacheTrack.setupContract(newContractAddress);
-            ProgramInvoke programInvoke = programInvokeFactory.createProgramInvoke(tx, txindex, executionBlock, cacheTrack, blockStore);
+            ProgramInvoke programInvoke = programInvokeFactory.createProgramInvoke(tx, txindex, executionBlock, cacheTrack, blockStore, signatureCache);
 
             this.vm = new VM(vmConfig, precompiledContracts);
-            this.program = new Program(vmConfig, precompiledContracts, blockFactory, activations, tx.getData(), programInvoke, tx, deletedAccounts);
+            this.program = new Program(vmConfig, precompiledContracts, blockFactory, activations, tx.getData(), programInvoke, tx, deletedAccounts, signatureCache);
 
             // reset storage if the contract with the same address already exists
             // TCK test case only - normally this is near-impossible situation in the real network
@@ -392,7 +391,7 @@ private void create() {
         }
 
         Coin endowment = tx.getValue();
-        cacheTrack.transfer(tx.getSender(), newContractAddress, endowment);
+        cacheTrack.transfer(tx.getSender(signatureCache), newContractAddress, endowment);
     }
 
     private void execError(Throwable err) {
@@ -420,7 +419,7 @@ private void go() {
         try {
 
             // Charge basic cost of the transaction
-            program.spendGas(tx.transactionCost(constants, activations), "TRANSACTION COST");
+            program.spendGas(tx.transactionCost(constants, activations, signatureCache), "TRANSACTION COST");
 
             vm.play(program);
 
@@ -520,8 +519,9 @@ private void finalization() {
         TransactionExecutionSummary summary = buildTransactionExecutionSummary(summaryBuilder, gasRefund);
 
         // Refund for gas leftover
-        track.addBalance(tx.getSender(), summary.getLeftover().add(summary.getRefund()));
-        logger.trace("Pay total refund to sender: [{}], refund val: [{}]", tx.getSender(), summary.getRefund());
+        RskAddress txSender = tx.getSender(signatureCache);
+        track.addBalance(txSender, summary.getLeftover().add(summary.getRefund()));
+        logger.trace("Pay total refund to sender: [{}], refund val: [{}]", txSender, summary.getRefund());
 
         // Transfer fees to miner
         Coin summaryFee = summary.getFee();
@@ -576,7 +576,9 @@ private void localCallFinalization() {
 
         TransactionExecutionSummary summary = buildTransactionExecutionSummary(summaryBuilder, gasRefund);
 
-        logger.trace("Pay total refund to sender: [{}], refund val: [{}]", tx.getSender(), summary.getRefund());
+        if (logger.isTraceEnabled()) {
+            logger.trace("Pay total refund to sender: [{}], refund val: [{}]", tx.getSender(signatureCache), summary.getRefund());
+        }
 
         // Transfer fees to miner
         this.paidFees = summary.getFee();
@@ -634,7 +636,7 @@ public void extractTrace(ProgramTraceProcessor programTraceProcessor) {
             programTraceProcessor.processProgramTrace(trace, tx.getHash());
         }
         else {
-            TransferInvoke invoke = new TransferInvoke(DataWord.valueOf(tx.getSender().getBytes()), DataWord.valueOf(tx.getReceiveAddress().getBytes()), 0L, DataWord.valueOf(tx.getValue().getBytes()));
+            TransferInvoke invoke = new TransferInvoke(DataWord.valueOf(tx.getSender(signatureCache).getBytes()), DataWord.valueOf(tx.getReceiveAddress().getBytes()), 0L, DataWord.valueOf(tx.getValue().getBytes()));
 
             SummarizedProgramTrace trace = new SummarizedProgramTrace(invoke);
 
diff --git a/rskj-core/src/main/java/org/ethereum/core/TransactionSet.java b/rskj-core/src/main/java/org/ethereum/core/TransactionSet.java
index 913ac95024b..ed367e935d0 100644
--- a/rskj-core/src/main/java/org/ethereum/core/TransactionSet.java
+++ b/rskj-core/src/main/java/org/ethereum/core/TransactionSet.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.core;
 
 import co.rsk.core.RskAddress;
@@ -28,17 +27,20 @@ public class TransactionSet {
     private final Map<Keccak256, Transaction> transactionsByHash;
     private final Map<RskAddress, List<Transaction>> transactionsByAddress;
 
-    public TransactionSet() {
-        this(new HashMap<>(), new HashMap<>());
+    private final SignatureCache signatureCache;
+
+    public TransactionSet(SignatureCache signatureCache) {
+        this(new HashMap<>(), new HashMap<>(), signatureCache);
     }
 
-    public TransactionSet(TransactionSet transactionSet) {
-        this(new HashMap<>(transactionSet.transactionsByHash), new HashMap<>(transactionSet.transactionsByAddress));
+    public TransactionSet(TransactionSet transactionSet, SignatureCache signatureCache) {
+        this(new HashMap<>(transactionSet.transactionsByHash), new HashMap<>(transactionSet.transactionsByAddress), signatureCache);
     }
 
-    public TransactionSet(Map<Keccak256, Transaction> transactionsByHash, Map<RskAddress, List<Transaction>> transactionsByAddress) {
+    public TransactionSet(Map<Keccak256, Transaction> transactionsByHash, Map<RskAddress, List<Transaction>> transactionsByAddress, SignatureCache signatureCache) {
         this.transactionsByHash = transactionsByHash;
         this.transactionsByAddress = transactionsByAddress;
+        this.signatureCache = signatureCache;
     }
 
     public void addTransaction(Transaction transaction) {
@@ -50,7 +52,7 @@ public void addTransaction(Transaction transaction) {
 
         this.transactionsByHash.put(txhash, transaction);
 
-        RskAddress senderAddress = transaction.getSender();
+        RskAddress senderAddress = transaction.getSender(signatureCache);
 
         List<Transaction> txs = this.transactionsByAddress.get(senderAddress);
 
@@ -85,7 +87,7 @@ public void removeTransactionByHash(Keccak256 hash) {
 
         this.transactionsByHash.remove(hash);
 
-        RskAddress senderAddress = transaction.getSender();
+        RskAddress senderAddress = transaction.getSender(signatureCache);
         List<Transaction> txs = this.transactionsByAddress.get(senderAddress);
 
         if (txs != null) {
diff --git a/rskj-core/src/main/java/org/ethereum/rpc/Web3Impl.java b/rskj-core/src/main/java/org/ethereum/rpc/Web3Impl.java
index 43fc5432101..f9cdb5ce2db 100644
--- a/rskj-core/src/main/java/org/ethereum/rpc/Web3Impl.java
+++ b/rskj-core/src/main/java/org/ethereum/rpc/Web3Impl.java
@@ -15,10 +15,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.rpc;
 
-
 import static co.rsk.util.HexUtils.jsonHexToInt;
 import static co.rsk.util.HexUtils.jsonHexToLong;
 import static co.rsk.util.HexUtils.stringHexToBigInteger;
@@ -46,10 +44,7 @@
 import java.util.function.UnaryOperator;
 
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockHeader;
-import org.ethereum.core.Blockchain;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.db.BlockInformation;
 import org.ethereum.db.BlockStore;
@@ -135,6 +130,8 @@ public class Web3Impl implements Web3 {
     private final RskModule rskModule;
     private final SyncProcessor syncProcessor;
 
+    private final SignatureCache signatureCache;
+
     private Ethereum eth;
 
     protected Web3Impl(
@@ -162,7 +159,8 @@ protected Web3Impl(
             BuildInfo buildInfo,
             BlocksBloomStore blocksBloomStore,
             Web3InformationRetriever web3InformationRetriever,
-            SyncProcessor syncProcessor) {
+            SyncProcessor syncProcessor,
+            SignatureCache signatureCache) {
         this.eth = eth;
         this.blockchain = blockchain;
         this.blockStore = blockStore;
@@ -188,6 +186,7 @@ protected Web3Impl(
         this.blocksBloomStore = blocksBloomStore;
         this.web3InformationRetriever = web3InformationRetriever;
         this.syncProcessor = syncProcessor;
+        this.signatureCache = signatureCache;
 
         personalModule.init();
     }
@@ -637,7 +636,7 @@ public BlockInformationResult getBlockInformationResult(BlockInformation blockIn
     }
 
     public BlockResultDTO getBlockResult(Block b, boolean fullTx) {
-        return BlockResultDTO.fromBlock(b, fullTx, this.blockStore, config.skipRemasc(), config.rpcZeroSignatureIfRemasc());
+        return BlockResultDTO.fromBlock(b, fullTx, this.blockStore, config.skipRemasc(), config.rpcZeroSignatureIfRemasc(), signatureCache);
     }
 
     public BlockInformationResult[] eth_getBlocksByNumber(String number) {
@@ -705,7 +704,7 @@ public TransactionResultDTO eth_getTransactionByHash(String transactionHash) {
 
                 for (Transaction tx : txs) {
                     if (tx.getHash().equals(txHash)) {
-                        return s = new TransactionResultDTO(null, null, tx, config.rpcZeroSignatureIfRemasc());
+                        return s = new TransactionResultDTO(null, null, tx, config.rpcZeroSignatureIfRemasc(), signatureCache);
                     }
                 }
             } else {
@@ -722,7 +721,7 @@ public TransactionResultDTO eth_getTransactionByHash(String transactionHash) {
                 return null;
             }
 
-            return s = new TransactionResultDTO(block, txInfo.getIndex(), txInfo.getReceipt().getTransaction(), config.rpcZeroSignatureIfRemasc());
+            return s = new TransactionResultDTO(block, txInfo.getIndex(), txInfo.getReceipt().getTransaction(), config.rpcZeroSignatureIfRemasc(), signatureCache);
         } finally {
             logger.debug("eth_getTransactionByHash({}): {}", transactionHash, s);
         }
@@ -746,7 +745,7 @@ public TransactionResultDTO eth_getTransactionByBlockHashAndIndex(String blockHa
 
             Transaction tx = b.getTransactionsList().get(idx);
 
-            return s = new TransactionResultDTO(b, idx, tx, config.rpcZeroSignatureIfRemasc());
+            return s = new TransactionResultDTO(b, idx, tx, config.rpcZeroSignatureIfRemasc(), signatureCache);
         } finally {
             if (logger.isDebugEnabled()) {
                 logger.debug("eth_getTransactionByBlockHashAndIndex({}, {}): {}", blockHash, index, s);
@@ -769,7 +768,7 @@ public TransactionResultDTO eth_getTransactionByBlockNumberAndIndex(String bnOrI
                 return null;
             }
 
-            s = new TransactionResultDTO(block.get(), idx, txs.get(idx), config.rpcZeroSignatureIfRemasc());
+            s = new TransactionResultDTO(block.get(), idx, txs.get(idx), config.rpcZeroSignatureIfRemasc(), signatureCache);
             return s;
         } finally {
             if (logger.isDebugEnabled()) {
@@ -794,7 +793,7 @@ public TransactionReceiptDTO eth_getTransactionReceipt(String transactionHash) {
         Transaction tx = block.getTransactionsList().get(txInfo.getIndex());
         txInfo.setTransaction(tx);
 
-        return new TransactionReceiptDTO(block, txInfo);
+        return new TransactionReceiptDTO(block, txInfo, signatureCache);
     }
 
     @Override
diff --git a/rskj-core/src/main/java/org/ethereum/rpc/dto/BlockResultDTO.java b/rskj-core/src/main/java/org/ethereum/rpc/dto/BlockResultDTO.java
index e6f33497eda..1acf8aaad7f 100644
--- a/rskj-core/src/main/java/org/ethereum/rpc/dto/BlockResultDTO.java
+++ b/rskj-core/src/main/java/org/ethereum/rpc/dto/BlockResultDTO.java
@@ -15,18 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.rpc.dto;
 
-import co.rsk.core.BlockDifficulty;
-import co.rsk.core.Coin;
-import co.rsk.core.RskAddress;
-import co.rsk.crypto.Keccak256;
-import co.rsk.util.HexUtils;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockHeader;
-import org.ethereum.core.Transaction;
-import org.ethereum.db.BlockStore;
+import static org.ethereum.crypto.HashUtil.EMPTY_TRIE_HASH;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,8 +26,17 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static org.ethereum.crypto.HashUtil.EMPTY_TRIE_HASH;
+import org.ethereum.core.Block;
+import org.ethereum.core.BlockHeader;
+import org.ethereum.core.SignatureCache;
+import org.ethereum.core.Transaction;
+import org.ethereum.db.BlockStore;
 
+import co.rsk.core.BlockDifficulty;
+import co.rsk.core.Coin;
+import co.rsk.core.RskAddress;
+import co.rsk.crypto.Keccak256;
+import co.rsk.util.HexUtils;
 
 public class BlockResultDTO {
     private final String number; // QUANTITY - the block number. null when its pending block.
@@ -122,7 +122,7 @@ private BlockResultDTO(
         this.paidFees = paidFees != null ? HexUtils.toQuantityJsonHex(paidFees.getBytes()) : null;
     }
 
-    public static BlockResultDTO fromBlock(Block b, boolean fullTx, BlockStore blockStore, boolean skipRemasc, boolean zeroSignatureIfRemasc) {
+    public static BlockResultDTO fromBlock(Block b, boolean fullTx, BlockStore blockStore, boolean skipRemasc, boolean zeroSignatureIfRemasc, SignatureCache signatureCache) {
         if (b == null) {
             return null;
         }
@@ -135,7 +135,7 @@ public static BlockResultDTO fromBlock(Block b, boolean fullTx, BlockStore block
         List<Transaction> blockTransactions = b.getTransactionsList();
         // For full tx will present as TransactionResultDTO otherwise just as transaction hash
         List<Object> transactions = IntStream.range(0, blockTransactions.size())
-                .mapToObj(txIndex -> toTransactionResult(txIndex, b, fullTx, skipRemasc, zeroSignatureIfRemasc))
+                .mapToObj(txIndex -> toTransactionResult(txIndex, b, fullTx, skipRemasc, zeroSignatureIfRemasc, signatureCache))
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
@@ -181,15 +181,15 @@ public static BlockResultDTO fromBlock(Block b, boolean fullTx, BlockStore block
         );
     }
 
-    private static Object toTransactionResult(int transactionIndex, Block block, boolean fullTx, boolean skipRemasc, boolean zeroSignatureIfRemasc) {
+    private static Object toTransactionResult(int transactionIndex, Block block, boolean fullTx, boolean skipRemasc, boolean zeroSignatureIfRemasc, SignatureCache signatureCache) {
         Transaction transaction = block.getTransactionsList().get(transactionIndex);
 
         if(skipRemasc && transaction.isRemascTransaction(transactionIndex, block.getTransactionsList().size())) {
             return null;
         }
-
+        
         if(fullTx) {
-            return new TransactionResultDTO(block, transactionIndex, transaction, zeroSignatureIfRemasc);
+            return new TransactionResultDTO(block, transactionIndex, transaction, zeroSignatureIfRemasc, signatureCache);
         }
 
         return transaction.getHash().toJsonString();
@@ -290,4 +290,4 @@ public String getHashForMergedMining() {
     public String getPaidFees() {
         return paidFees;
     }
-}
+}
\ No newline at end of file
diff --git a/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionReceiptDTO.java b/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionReceiptDTO.java
index d26262fe4fc..e1873dc184c 100644
--- a/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionReceiptDTO.java
+++ b/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionReceiptDTO.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.rpc.dto;
 
 import org.ethereum.core.Block;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.TransactionReceipt;
 import org.ethereum.db.TransactionInfo;
 import org.ethereum.rpc.LogFilterElement;
@@ -44,7 +44,7 @@ public class TransactionReceiptDTO {
     private String status;               // either 1 (success) or 0 (failure)
     private String logsBloom;            // Bloom filter for light clients to quickly retrieve related logs.
 
-    public TransactionReceiptDTO(Block block, TransactionInfo txInfo) {
+    public TransactionReceiptDTO(Block block, TransactionInfo txInfo, SignatureCache signatureCache) {
         TransactionReceipt receipt = txInfo.getReceipt();
 
         status = HexUtils.toQuantityJsonHex(txInfo.getReceipt().getStatus());
@@ -57,7 +57,7 @@ public TransactionReceiptDTO(Block block, TransactionInfo txInfo) {
         }
 
         cumulativeGasUsed = HexUtils.toQuantityJsonHex(receipt.getCumulativeGas());
-        from = receipt.getTransaction().getSender().toJsonString();
+        from = receipt.getTransaction().getSender(signatureCache).toJsonString();
         gasUsed = HexUtils.toQuantityJsonHex(receipt.getGasUsed());
 
         logs = new LogFilterElement[receipt.getLogInfoList().size()];
diff --git a/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionResultDTO.java b/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionResultDTO.java
index c86003493f9..9f7ab3e886f 100644
--- a/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionResultDTO.java
+++ b/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionResultDTO.java
@@ -15,16 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.rpc.dto;
 
-import co.rsk.core.Coin;
-import co.rsk.remasc.RemascTransaction;
-import co.rsk.util.HexUtils;
 import org.ethereum.core.Block;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.crypto.signature.ECDSASignature;
 
+import co.rsk.core.Coin;
+import co.rsk.remasc.RemascTransaction;
+import co.rsk.util.HexUtils;
+
 /**
  * Created by Ruben on 8/1/2016.
  */
@@ -47,7 +48,7 @@ public class TransactionResultDTO {
     private String r;
     private String s;
 
-    public TransactionResultDTO(Block b, Integer index, Transaction tx, boolean zeroSignatureIfRemasc) {
+    public TransactionResultDTO(Block b, Integer index, Transaction tx, boolean zeroSignatureIfRemasc, SignatureCache signatureCache) {
         hash = tx.getHash().toJsonString();
 
         nonce = HexUtils.toQuantityJsonHex(tx.getNonce());
@@ -56,7 +57,7 @@ public TransactionResultDTO(Block b, Integer index, Transaction tx, boolean zero
         blockNumber = b != null ? HexUtils.toQuantityJsonHex(b.getNumber()) : null;
         transactionIndex = index != null ? HexUtils.toQuantityJsonHex(index) : null;
 
-        from = tx.getSender().toJsonString();
+        from = tx.getSender(signatureCache).toJsonString();
         to = tx.getReceiveAddress().toJsonString();
         gas = HexUtils.toQuantityJsonHex(tx.getGasLimit());
 
@@ -141,4 +142,4 @@ public String getS() {
         return s;
     }
 
-}
+}
\ No newline at end of file
diff --git a/rskj-core/src/main/java/org/ethereum/vm/PrecompiledContracts.java b/rskj-core/src/main/java/org/ethereum/vm/PrecompiledContracts.java
index df75f855c4e..4a62a4caa93 100644
--- a/rskj-core/src/main/java/org/ethereum/vm/PrecompiledContracts.java
+++ b/rskj-core/src/main/java/org/ethereum/vm/PrecompiledContracts.java
@@ -1,4 +1,3 @@
-package org.ethereum.vm;
 /*
  * This file is part of RskJ
  * Copyright (C) 2017 RSK Labs Ltd.
@@ -17,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
+package org.ethereum.vm;
 
 import co.rsk.config.RemascConfig;
 import co.rsk.config.RemascConfigFactory;
@@ -37,6 +36,7 @@
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
 import org.ethereum.core.Block;
 import org.ethereum.core.Repository;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.crypto.HashUtil;
@@ -58,8 +58,6 @@
 
 import static org.ethereum.util.ByteUtil.*;
 
-
-
 /**
  * @author Roman Mandeleil
  * @since 09.01.2015
@@ -137,10 +135,14 @@ public class PrecompiledContracts {
     private static BigIntegerModexp bigIntegerModexp = new BigIntegerModexp();
     private final RskSystemProperties config;
     private final BridgeSupportFactory bridgeSupportFactory;
+    private final SignatureCache signatureCache;
 
-    public PrecompiledContracts(RskSystemProperties config, BridgeSupportFactory bridgeSupportFactory) {
+    public PrecompiledContracts(RskSystemProperties config,
+                                BridgeSupportFactory bridgeSupportFactory,
+                                SignatureCache signatureCache) {
         this.config = config;
         this.bridgeSupportFactory = bridgeSupportFactory;
+        this.signatureCache = signatureCache;
     }
 
 
@@ -162,8 +164,11 @@ public PrecompiledContract getContractForAddress(ActivationConfig.ForBlock activ
             return identity;
         }
         if (address.equals(BRIDGE_ADDR_DW)) {
-            return new Bridge(BRIDGE_ADDR, config.getNetworkConstants(), config.getActivationConfig(),
-                    bridgeSupportFactory);
+            return new Bridge(
+                    BRIDGE_ADDR,
+                    config.getNetworkConstants(),
+                    config.getActivationConfig(),
+                    bridgeSupportFactory, signatureCache);
         }
         if (address.equals(BIG_INT_MODEXP_ADDR_DW)) {
             return bigIntegerModexp;
diff --git a/rskj-core/src/main/java/org/ethereum/vm/program/InternalTransaction.java b/rskj-core/src/main/java/org/ethereum/vm/program/InternalTransaction.java
index e0f299debce..b2a4fa2e614 100644
--- a/rskj-core/src/main/java/org/ethereum/vm/program/InternalTransaction.java
+++ b/rskj-core/src/main/java/org/ethereum/vm/program/InternalTransaction.java
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.vm.program;
 
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.util.ByteUtil;
@@ -34,10 +34,12 @@ public class InternalTransaction extends Transaction {
     private final int deep;
     private final int index;
     private final String note;
+    private final SignatureCache signatureCache;
+
     private boolean rejected = false;
 
     public InternalTransaction(byte[] originHash, byte[] parentHash, int deep, int index, byte[] nonce, DataWord gasPrice, DataWord gasLimit,
-        byte[] sendAddress, byte[] receiveAddress, byte[] value, byte[] data, String note) {
+                               byte[] sendAddress, byte[] receiveAddress, byte[] value, byte[] data, String note, SignatureCache signatureCache) {
 
         super(nonce, getData(gasPrice), getData(gasLimit), receiveAddress, nullToEmpty(value), nullToEmpty(data));
 
@@ -47,11 +49,12 @@ public InternalTransaction(byte[] originHash, byte[] parentHash, int deep, int i
         this.index = index;
         this.sender = RLP.parseRskAddress(sendAddress);
         this.note = note;
+        this.signatureCache = signatureCache;
     }
 
     public InternalTransaction(byte[] parentHash, int deep, int index, byte[] nonce, DataWord gasPrice, DataWord gasLimit,
-                               byte[] sendAddress, byte[] receiveAddress, byte[] value, byte[] data, String note) {
-        this(parentHash, parentHash, deep, index, nonce, gasPrice, gasLimit, sendAddress, receiveAddress, value, data, note);
+                               byte[] sendAddress, byte[] receiveAddress, byte[] value, byte[] data, String note, SignatureCache signatureCache) {
+        this(parentHash, parentHash, deep, index, nonce, gasPrice, gasLimit, sendAddress, receiveAddress, value, data, note, signatureCache);
     }
 
     private static byte[] getData(DataWord gasPrice) {
@@ -94,7 +97,7 @@ public byte[] getEncoded() {
         } else {
             nonce = RLP.encodeElement(nonce);
         }
-        byte[] senderAddress = RLP.encodeElement(getSender().getBytes());
+        byte[] senderAddress = RLP.encodeElement(getSender(signatureCache).getBytes());
         byte[] receiveAddress = RLP.encodeElement(getReceiveAddress().getBytes());
         byte[] value = RLP.encodeCoin(getValue());
         byte[] gasPrice = RLP.encodeCoin(getGasPrice());
diff --git a/rskj-core/src/main/java/org/ethereum/vm/program/Program.java b/rskj-core/src/main/java/org/ethereum/vm/program/Program.java
index 2e88a1280e4..9a2ec121b15 100644
--- a/rskj-core/src/main/java/org/ethereum/vm/program/Program.java
+++ b/rskj-core/src/main/java/org/ethereum/vm/program/Program.java
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.vm.program;
 
 import co.rsk.config.VmConfig;
@@ -34,10 +33,7 @@
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.util.FastByteComparisons;
@@ -115,6 +111,8 @@ public class Program {
 
     private final Set<DataWord> deletedAccountsInBlock;
 
+    private final SignatureCache signatureCache;
+
     public Program(
             VmConfig config,
             PrecompiledContracts precompiledContracts,
@@ -123,7 +121,8 @@ public Program(
             byte[] ops,
             ProgramInvoke programInvoke,
             Transaction transaction,
-            Set<DataWord> deletedAccounts) {
+            Set<DataWord> deletedAccounts,
+            SignatureCache signatureCache) {
         this.config = config;
         this.precompiledContracts = precompiledContracts;
         this.blockFactory = blockFactory;
@@ -150,6 +149,7 @@ public Program(
         this.stack.ensureCapacity(1024); // faster?
         this.storage = setupProgramListener(new Storage(programInvoke));
         this.deletedAccountsInBlock = new HashSet<>(deletedAccounts);
+        this.signatureCache = signatureCache;
 
         precompile();
         traceListener = new ProgramTraceListener(config);
@@ -201,7 +201,8 @@ private InternalTransaction addInternalTx(byte[] nonce, DataWord gasLimit, RskAd
                 receiveAddress.getBytes(),
                 value.getBytes(),
                 data,
-                note);
+                note,
+                signatureCache);
     }
 
     private <T extends ProgramListenerAware> T setupProgramListener(T traceListenerAware) {
@@ -600,7 +601,7 @@ private ProgramResult getProgramResult(RskAddress senderAddress, byte[] nonce, D
 
         if (!isEmpty(programCode)) {
             VM vm = new VM(config, precompiledContracts);
-            Program program = new Program(config, precompiledContracts, blockFactory, activations, programCode, programInvoke, internalTx, deletedAccountsInBlock);
+            Program program = new Program(config, precompiledContracts, blockFactory, activations, programCode, programInvoke, internalTx, deletedAccountsInBlock, signatureCache);
             vm.play(program);
             programResult = program.getResult();
 
@@ -825,7 +826,7 @@ private boolean executeCode(
                 msg.getType() == MsgType.STATICCALL || isStaticCall(), byTestingSuite());
 
         VM vm = new VM(config, precompiledContracts);
-        Program program = new Program(config, precompiledContracts, blockFactory, activations, programCode, programInvoke, internalTx, deletedAccountsInBlock);
+        Program program = new Program(config, precompiledContracts, blockFactory, activations, programCode, programInvoke, internalTx, deletedAccountsInBlock, signatureCache);
 
         vm.play(program);
         childResult = program.getResult();
diff --git a/rskj-core/src/main/java/org/ethereum/vm/program/ProgramResult.java b/rskj-core/src/main/java/org/ethereum/vm/program/ProgramResult.java
index 7f54299d5fc..f329eb4fc30 100644
--- a/rskj-core/src/main/java/org/ethereum/vm/program/ProgramResult.java
+++ b/rskj-core/src/main/java/org/ethereum/vm/program/ProgramResult.java
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.vm.program;
 
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.vm.CallCreate;
 import org.ethereum.vm.DataWord;
@@ -215,7 +215,8 @@ public InternalTransaction addInternalTransaction(
         byte[] receiveAddress,
         byte[] value,
         byte[] data,
-        String note
+        String note,
+        SignatureCache signatureCache
     ) {
         byte[] parentHash = parentTransaction.getHash().getBytes();
         byte[] originHash = parentHash;
@@ -234,7 +235,8 @@ public InternalTransaction addInternalTransaction(
             receiveAddress,
             value,
             data,
-            note
+            note,
+            signatureCache
         );
         getInternalTransactions().add(transaction);
         return transaction;
diff --git a/rskj-core/src/main/java/org/ethereum/vm/program/invoke/ProgramInvokeFactory.java b/rskj-core/src/main/java/org/ethereum/vm/program/invoke/ProgramInvokeFactory.java
index b0df955dd05..63befefe62e 100644
--- a/rskj-core/src/main/java/org/ethereum/vm/program/invoke/ProgramInvokeFactory.java
+++ b/rskj-core/src/main/java/org/ethereum/vm/program/invoke/ProgramInvokeFactory.java
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.vm.program.invoke;
 
 import co.rsk.core.Coin;
 import org.ethereum.core.Block;
 import org.ethereum.core.Repository;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.db.BlockStore;
 import org.ethereum.vm.DataWord;
@@ -34,7 +34,8 @@
 public interface ProgramInvokeFactory {
 
     ProgramInvoke createProgramInvoke(Transaction tx, int txindex, Block block,
-                                      Repository repository, BlockStore blockStore);
+                                      Repository repository, BlockStore blockStore,
+                                      SignatureCache signatureCache);
 
     ProgramInvoke createProgramInvoke(Program program, DataWord toAddress, DataWord callerAddress,
                                       DataWord inValue, long inGas,
diff --git a/rskj-core/src/main/java/org/ethereum/vm/program/invoke/ProgramInvokeFactoryImpl.java b/rskj-core/src/main/java/org/ethereum/vm/program/invoke/ProgramInvokeFactoryImpl.java
index 824cecb34a3..cd07c765f07 100644
--- a/rskj-core/src/main/java/org/ethereum/vm/program/invoke/ProgramInvokeFactoryImpl.java
+++ b/rskj-core/src/main/java/org/ethereum/vm/program/invoke/ProgramInvokeFactoryImpl.java
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.vm.program.invoke;
 
 import co.rsk.core.Coin;
 import co.rsk.core.RskAddress;
 import org.ethereum.core.Block;
 import org.ethereum.core.Repository;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.db.BlockStore;
 import org.ethereum.util.ByteUtil;
@@ -46,7 +46,7 @@ public class ProgramInvokeFactoryImpl implements ProgramInvokeFactory {
     // Invocation by the wire tx
     @Override
     public ProgramInvoke createProgramInvoke(Transaction tx, int txindex, Block block, Repository repository,
-                                             BlockStore blockStore) {
+                                             BlockStore blockStore, SignatureCache signatureCache) {
 
         /***         ADDRESS op       ***/
         // YP: Get address of currently executing account.
@@ -54,11 +54,11 @@ public ProgramInvoke createProgramInvoke(Transaction tx, int txindex, Block bloc
 
         /***         ORIGIN op       ***/
         // YP: This is the sender of original transaction; it is never a contract.
-        byte[] origin = tx.getSender().getBytes();
+        byte[] origin = tx.getSender(signatureCache).getBytes();
 
         /***         CALLER op       ***/
         // YP: This is the address of the account that is directly responsible for this execution.
-        byte[] caller = tx.getSender().getBytes();
+        byte[] caller = tx.getSender(signatureCache).getBytes();
 
         /***         BALANCE op       ***/
         Coin balance = repository.getBalance(addr);
diff --git a/rskj-core/src/test/java/co/rsk/TestHelpers/Tx.java b/rskj-core/src/test/java/co/rsk/TestHelpers/Tx.java
index 87b79e07909..d7339ea06fa 100644
--- a/rskj-core/src/test/java/co/rsk/TestHelpers/Tx.java
+++ b/rskj-core/src/test/java/co/rsk/TestHelpers/Tx.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.TestHelpers;
 
 import co.rsk.config.RskSystemProperties;
@@ -23,6 +22,7 @@
 import co.rsk.core.RskAddress;
 import co.rsk.crypto.Keccak256;
 import org.ethereum.TestUtils;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.mockito.Mockito;
 
@@ -32,7 +32,6 @@
 
 import static org.mockito.Mockito.any;
 
-
 public class Tx {
 
     public static Transaction create(
@@ -60,11 +59,11 @@ public static Transaction create(
         r.nextBytes(returnReceiveAddressBytes);
         RskAddress returnReceiveAddress = new RskAddress(returnReceiveAddressBytes);
 
-        Mockito.when(transaction.getSender()).thenReturn(returnSender);
+        Mockito.when(transaction.getSender(any(SignatureCache.class))).thenReturn(returnSender);
         Mockito.when(transaction.getHash()).thenReturn(new Keccak256(TestUtils.randomBytes(32)));
         Mockito.when(transaction.acceptTransactionSignature(config.getNetworkConstants().getChainId())).thenReturn(Boolean.TRUE);
         Mockito.when(transaction.getReceiveAddress()).thenReturn(returnReceiveAddress);
-        ArrayList<Byte> bytes = new ArrayList();
+        ArrayList<Byte> bytes = new ArrayList<>();
         long amount = 21000;
         if (data != 0) {
             data /= 2;
@@ -78,12 +77,12 @@ public static Transaction create(
             }
         }
         int n = bytes.size();
-        byte b[] = new byte[n];
+        byte[] b = new byte[n];
         for (int i = 0; i < n; i++) {
             b[i] = bytes.get(i);
         }
         Mockito.when(transaction.getData()).thenReturn(b);
-        Mockito.when(transaction.transactionCost(any(), any())).thenReturn(amount);
+        Mockito.when(transaction.transactionCost(any(), any(), any())).thenReturn(amount);
 
         return transaction;
     }
diff --git a/rskj-core/src/test/java/co/rsk/core/CallContractTest.java b/rskj-core/src/test/java/co/rsk/core/CallContractTest.java
index f99da2e879a..7ac495685bf 100644
--- a/rskj-core/src/test/java/co/rsk/core/CallContractTest.java
+++ b/rskj-core/src/test/java/co/rsk/core/CallContractTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.core;
 
 import co.rsk.config.TestSystemProperties;
@@ -72,7 +71,8 @@ private static ProgramResult callContract(World world, RskAddress receiveAddress
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 btcBlockStoreFactory,
                 config.getNetworkConstants().getBridgeConstants(),
-                config.getActivationConfig());
+                config.getActivationConfig(),
+                world.getBlockTxSignatureCache());
 
         try {
             TransactionExecutorFactory transactionExecutorFactory = new TransactionExecutorFactory(
@@ -81,7 +81,7 @@ private static ProgramResult callContract(World world, RskAddress receiveAddress
                     null,
                     blockFactory,
                     new ProgramInvokeFactoryImpl(),
-                    new PrecompiledContracts(config, bridgeSupportFactory),
+                    new PrecompiledContracts(config, bridgeSupportFactory, world.getBlockTxSignatureCache()),
                     world.getBlockTxSignatureCache()
             );
 
diff --git a/rskj-core/src/test/java/co/rsk/core/TransactionTest.java b/rskj-core/src/test/java/co/rsk/core/TransactionTest.java
index 1ec049d3f4d..e7a02f5e12a 100644
--- a/rskj-core/src/test/java/co/rsk/core/TransactionTest.java
+++ b/rskj-core/src/test/java/co/rsk/core/TransactionTest.java
@@ -258,8 +258,9 @@ protected ProgramResult executeTransaction(Transaction tx) {
                             new RepositoryBtcBlockStoreWithCache.Factory(
                                     config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                             config.getNetworkConstants().getBridgeConstants(),
-                            config.getActivationConfig());
-                    precompiledContracts = new PrecompiledContracts(config, bridgeSupportFactory);
+                            config.getActivationConfig(),
+                            signatureCache);
+                    precompiledContracts = new PrecompiledContracts(config, bridgeSupportFactory, signatureCache);
                     TransactionExecutorFactory transactionExecutorFactory = new TransactionExecutorFactory(
                             config,
                             new BlockStoreDummy(),
diff --git a/rskj-core/src/test/java/co/rsk/core/bc/BlockExecutorTest.java b/rskj-core/src/test/java/co/rsk/core/bc/BlockExecutorTest.java
index 131d8d554ba..4571a5a72b3 100644
--- a/rskj-core/src/test/java/co/rsk/core/bc/BlockExecutorTest.java
+++ b/rskj-core/src/test/java/co/rsk/core/bc/BlockExecutorTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.core.bc;
 
 import co.rsk.blockchain.utils.BlockGenerator;
@@ -849,7 +848,9 @@ private static BlockExecutor buildBlockExecutor(TrieStore store, RskSystemProper
                 config.getNetworkConstants().getBridgeConstants().getBtcParams());
 
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
-                btcBlockStoreFactory, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig());
+                btcBlockStoreFactory, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
+
+        BlockTxSignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
 
         return new BlockExecutor(
                 config.getActivationConfig(),
@@ -860,8 +861,8 @@ private static BlockExecutor buildBlockExecutor(TrieStore store, RskSystemProper
                         null,
                         BLOCK_FACTORY,
                         new ProgramInvokeFactoryImpl(),
-                        new PrecompiledContracts(config, bridgeSupportFactory),
-                        new BlockTxSignatureCache(new ReceivedTxSignatureCache())
+                        new PrecompiledContracts(config, bridgeSupportFactory, signatureCache),
+                        signatureCache
                 )
         );
     }
diff --git a/rskj-core/src/test/java/co/rsk/core/bc/BlockValidatorBuilder.java b/rskj-core/src/test/java/co/rsk/core/bc/BlockValidatorBuilder.java
index 06cd21f4fd2..fd0b881a61c 100644
--- a/rskj-core/src/test/java/co/rsk/core/bc/BlockValidatorBuilder.java
+++ b/rskj-core/src/test/java/co/rsk/core/bc/BlockValidatorBuilder.java
@@ -71,7 +71,8 @@ public BlockValidatorBuilder() {
     }
 
     public BlockValidatorBuilder addBlockTxsFieldsValidationRule() {
-        this.blockTxsFieldsValidationRule = new BlockTxsFieldsValidationRule();
+        this.blockTxsFieldsValidationRule = new BlockTxsFieldsValidationRule(
+                new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         return this;
     }
 
diff --git a/rskj-core/src/test/java/co/rsk/mine/BlockToMineBuilderTest.java b/rskj-core/src/test/java/co/rsk/mine/BlockToMineBuilderTest.java
index 99d523cf7d4..a381fb9e08c 100644
--- a/rskj-core/src/test/java/co/rsk/mine/BlockToMineBuilderTest.java
+++ b/rskj-core/src/test/java/co/rsk/mine/BlockToMineBuilderTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.mine;
 
 import co.rsk.config.GasLimitConfig;
@@ -28,7 +27,6 @@
 import co.rsk.core.bc.FamilyUtils;
 import co.rsk.crypto.Keccak256;
 import co.rsk.db.RepositoryLocator;
-import co.rsk.db.StateRootHandler;
 import co.rsk.validators.BlockValidationRule;
 import org.ethereum.TestUtils;
 import org.ethereum.config.Constants;
@@ -68,11 +66,11 @@ void setUp() {
         validationRules = mock(BlockValidationRule.class);
 
         RepositoryLocator repositoryLocator = mock(RepositoryLocator.class);
-        StateRootHandler stateRootHandler = mock(StateRootHandler.class);
         MiningConfig miningConfig = mock(MiningConfig.class);
         DifficultyCalculator difficultyCalculator = mock(DifficultyCalculator.class);
         MinimumGasPriceCalculator minimumGasPriceCalculator = mock(MinimumGasPriceCalculator.class);
         MinerUtils minerUtils = mock(MinerUtils.class);
+        SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
         activationConfig = mock(ActivationConfig.class);
 
         blockExecutor = mock(BlockExecutor.class);
@@ -90,15 +88,16 @@ void setUp() {
                 new BlockFactory(activationConfig),
                 blockExecutor,
                 minimumGasPriceCalculator,
-                minerUtils
+                minerUtils,
+                signatureCache
         );
 
         BlockDifficulty blockDifficulty = mock(BlockDifficulty.class);
         Repository snapshot = mock(Repository.class);
         GasLimitConfig gasLimitConfig = new GasLimitConfig(0,0,false);
 
-        when(minerUtils.getAllTransactions(any())).thenReturn(new ArrayList<>());
-        when(minerUtils.filterTransactions(any(), any(), any(), any(), any(), anyBoolean())).thenReturn(new ArrayList<>());
+        when(minerUtils.getAllTransactions(any(), any())).thenReturn(new ArrayList<>());
+        when(minerUtils.filterTransactions(any(), any(), any(), any(), any(), anyBoolean(), any())).thenReturn(new ArrayList<>());
         when(repositoryLocator.snapshotAt(any())).thenReturn(snapshot);
         when(minimumGasPriceCalculator.calculate(any())).thenReturn(mock(Coin.class));
         when(miningConfig.getGasLimit()).thenReturn(gasLimitConfig);
diff --git a/rskj-core/src/test/java/co/rsk/mine/MainNetMinerTest.java b/rskj-core/src/test/java/co/rsk/mine/MainNetMinerTest.java
index d91523e757e..27e95284af2 100644
--- a/rskj-core/src/test/java/co/rsk/mine/MainNetMinerTest.java
+++ b/rskj-core/src/test/java/co/rsk/mine/MainNetMinerTest.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of RskJ
+ * Copyright (C) 2019 RSK Labs Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package co.rsk.mine;
 
 import co.rsk.bitcoinj.core.NetworkParameters;
@@ -19,10 +36,7 @@
 import co.rsk.validators.ProofOfWorkRule;
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Genesis;
-import org.ethereum.core.ImportResult;
-import org.ethereum.core.TransactionPool;
+import org.ethereum.core.*;
 import org.ethereum.core.genesis.GenesisLoader;
 import org.ethereum.db.BlockStore;
 import org.ethereum.facade.EthereumImpl;
@@ -31,11 +45,9 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 
 import java.math.BigInteger;
-import java.nio.file.Path;
 import java.time.Clock;
 
 import static org.mockito.Mockito.spy;
@@ -222,7 +234,8 @@ private BlockToMineBuilder blockToMineBuilder() {
                 blockFactory,
                 blockExecutor,
                 new MinimumGasPriceCalculator(Coin.valueOf(miningConfig.getMinGasPriceTarget())),
-                new MinerUtils()
+                new MinerUtils(),
+                new BlockTxSignatureCache(new ReceivedTxSignatureCache())
         );
     }
-}
+}
\ No newline at end of file
diff --git a/rskj-core/src/test/java/co/rsk/mine/MinerManagerTest.java b/rskj-core/src/test/java/co/rsk/mine/MinerManagerTest.java
index 9df38b2dfa6..527736e0976 100644
--- a/rskj-core/src/test/java/co/rsk/mine/MinerManagerTest.java
+++ b/rskj-core/src/test/java/co/rsk/mine/MinerManagerTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.mine;
 
 import co.rsk.config.ConfigUtils;
@@ -31,10 +30,7 @@
 import co.rsk.validators.BlockValidationRule;
 import co.rsk.validators.ProofOfWorkRule;
 import org.awaitility.Awaitility;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Blockchain;
-import org.ethereum.core.TransactionPool;
+import org.ethereum.core.*;
 import org.ethereum.db.BlockStore;
 import org.ethereum.rpc.Simples.SimpleEthereum;
 import org.ethereum.util.BuildInfo;
@@ -291,7 +287,8 @@ private MinerServerImpl getMinerServer() {
                         blockFactory,
                         blockExecutor,
                         new MinimumGasPriceCalculator(Coin.valueOf(miningConfig.getMinGasPriceTarget())),
-                        new MinerUtils()
+                        new MinerUtils(),
+                        new BlockTxSignatureCache(new ReceivedTxSignatureCache()) // TODO -> should it be ReceivedTxSignatureCache? See Miner Server Test for reference
                 ),
                 clock,
                 blockFactory,
diff --git a/rskj-core/src/test/java/co/rsk/mine/MinerServerTest.java b/rskj-core/src/test/java/co/rsk/mine/MinerServerTest.java
index 3d69b87e7e9..bf0033e8f84 100644
--- a/rskj-core/src/test/java/co/rsk/mine/MinerServerTest.java
+++ b/rskj-core/src/test/java/co/rsk/mine/MinerServerTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.mine;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -34,7 +33,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.time.Clock;
@@ -43,18 +41,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import co.rsk.core.RskAddress;
 import org.ethereum.TestUtils;
-import org.ethereum.core.Account;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.BlockTxSignatureCache;
-import org.ethereum.core.Blockchain;
-import org.ethereum.core.Genesis;
-import org.ethereum.core.ImportResult;
-import org.ethereum.core.ReceivedTxSignatureCache;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
-import org.ethereum.core.TransactionPool;
+import org.ethereum.core.*;
 import org.ethereum.db.BlockStore;
 import org.ethereum.facade.Ethereum;
 import org.ethereum.facade.EthereumImpl;
@@ -101,7 +90,6 @@
 import co.rsk.validators.BlockUnclesValidationRule;
 import co.rsk.validators.ProofOfWorkRule;
 
-
 /**
  * Created by adrian.eidelman on 3/16/2016.
  */
@@ -118,9 +106,9 @@ public abstract class MinerServerTest {
     private BlockExecutor blockExecutor;
     private MinimumGasPriceCalculator minimumGasPriceCalculator;
     private MinerUtils minerUtils;
-    private ReceivedTxSignatureCache signatureCache;
     private Repository repository;
     private CompositeEthereumListener compositeEthereumListener;
+    private SignatureCache signatureCache;
     private RskTestFactory rskTestContext;
 
     protected void setUp(TestSystemProperties config) {
@@ -168,15 +156,19 @@ void buildBlockToMineCheckThatLastTransactionIsForREMASC() {
         when(tx1.getHash()).thenReturn(new Keccak256(s1));
         when(tx1.getEncoded()).thenReturn(new byte[32]);
 
+        // IMPORTANT: tx1 is a mock, each mock has a random sender set at creation time (Tx.java)
+        // There's no need of passing a cache here since getSender method is stubbed to always
+        // return the sender, and we only need to use its value when stubbing track methods.
+        RskAddress tx1Sender = tx1.getSender(signatureCache);
+
         Repository repository = repositoryLocator.startTrackingAt(blockStore.getBestBlock().getHeader());
         Repository track = mock(Repository.class);
-        BlockTxSignatureCache blockTxSignatureCache = mock(BlockTxSignatureCache.class);
+
         Mockito.doReturn(repository.getRoot()).when(track).getRoot();
         Mockito.doReturn(repository.getTrie()).when(track).getTrie();
-        when(track.getNonce(tx1.getSender())).thenReturn(BigInteger.ZERO);
-        when(track.getNonce(tx1.getSender(blockTxSignatureCache))).thenReturn(BigInteger.ZERO);
+        when(track.getNonce(tx1Sender)).thenReturn(BigInteger.ZERO);
         when(track.getNonce(RemascTransaction.REMASC_ADDRESS)).thenReturn(BigInteger.ZERO);
-        when(track.getBalance(tx1.getSender())).thenReturn(Coin.valueOf(4200000L));
+        when(track.getBalance(tx1Sender)).thenReturn(Coin.valueOf(4200000L));
         when(track.getBalance(RemascTransaction.REMASC_ADDRESS)).thenReturn(Coin.valueOf(4200000L));
         Mockito.doReturn(track).when(repositoryLocator).startTrackingAt(any());
         Mockito.doReturn(track).when(track).startTracking();
@@ -874,7 +866,8 @@ private MinerServer makeMinerServer(Ethereum ethereum, BlockProcessor blockProce
                         blockFactory,
                         blockExecutor,
                         minimumGasPriceCalculator,
-                        minerUtils
+                        minerUtils,
+                        signatureCache
                 ),
                 clock,
                 blockFactory,
@@ -906,7 +899,8 @@ private MinerServer makeMinerServer(Ethereum ethereum, BlockUnclesValidationRule
                         blockFactory,
                         blockExecutor,
                         minimumGasPriceCalculator,
-                        minerUtils
+                        minerUtils,
+                        signatureCache
                 ),
                 clock,
                 blockFactory,
diff --git a/rskj-core/src/test/java/co/rsk/mine/MinerUtilsTest.java b/rskj-core/src/test/java/co/rsk/mine/MinerUtilsTest.java
index fb5696a8db9..d4a7cd5cf96 100644
--- a/rskj-core/src/test/java/co/rsk/mine/MinerUtilsTest.java
+++ b/rskj-core/src/test/java/co/rsk/mine/MinerUtilsTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.mine;
 
 import co.rsk.TestHelpers.Tx;
@@ -23,9 +22,7 @@
 import co.rsk.core.Coin;
 import co.rsk.core.RskAddress;
 import co.rsk.crypto.Keccak256;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
-import org.ethereum.core.TransactionPool;
+import org.ethereum.core.*;
 import org.ethereum.util.ByteUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,15 +32,19 @@
 import java.math.BigInteger;
 import java.util.*;
 
+import static org.mockito.ArgumentMatchers.any;
+
 class MinerUtilsTest {
 
     private static final Coin ONE_COIN = Coin.valueOf(1L);
 
     private final TestSystemProperties config = new TestSystemProperties();
     private MinerUtils minerUtils;
+    private SignatureCache signatureCache;
 
     @BeforeEach
     void setup() {
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
         minerUtils = new MinerUtils();
     }
 
@@ -68,8 +69,8 @@ void getAllTransactionsTest() {
         Mockito.when(tx2.getNonce()).thenReturn(ByteUtil.cloneBytes(BigInteger.TEN.toByteArray()));
         Mockito.when(tx1.getGasPrice()).thenReturn(Coin.valueOf(1));
         Mockito.when(tx2.getGasPrice()).thenReturn(Coin.valueOf(1));
-        Mockito.when(tx1.getSender()).thenReturn(new RskAddress(addressBytes));
-        Mockito.when(tx2.getSender()).thenReturn(new RskAddress(addressBytes));
+        Mockito.when(tx1.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes));
+        Mockito.when(tx2.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes));
 
         List<Transaction> txs = new LinkedList<>();
 
@@ -78,7 +79,7 @@ void getAllTransactionsTest() {
 
         Mockito.when(transactionPool.getPendingTransactions()).thenReturn(txs);
 
-        List<Transaction> res = minerUtils.getAllTransactions(transactionPool);
+        List<Transaction> res = minerUtils.getAllTransactions(transactionPool, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         Assertions.assertEquals(2, res.size());
     }
@@ -89,11 +90,11 @@ void validTransactionRepositoryNonceTest() {
         //Mockito.when(tx.checkGasPrice(Mockito.any(BigInteger.class))).thenReturn(true);
         List<Transaction> txs = new LinkedList<>();
         txs.add(tx);
-        Map<RskAddress, BigInteger> accountNounces = new HashMap();
+        Map<RskAddress, BigInteger> accountNounces = new HashMap<>();
         Repository repository = Mockito.mock(Repository.class);
-        Mockito.when(repository.getNonce(tx.getSender())).thenReturn(BigInteger.valueOf(0));
+        Mockito.when(repository.getNonce(tx.getSender(signatureCache))).thenReturn(BigInteger.valueOf(0));
 
-        List<Transaction> res = minerUtils.filterTransactions(new LinkedList<>(), txs, accountNounces, repository, ONE_COIN, true);
+        List<Transaction> res = minerUtils.filterTransactions(new LinkedList<>(), txs, accountNounces, repository, ONE_COIN, true, signatureCache);
         Assertions.assertEquals(1, res.size());
     }
 
@@ -103,11 +104,11 @@ void validTransactionAccWrapNonceTest() {
         //Mockito.when(tx.checkGasPrice(Mockito.any(BigInteger.class))).thenReturn(true);
         List<Transaction> txs = new LinkedList<>();
         txs.add(tx);
-        Map<RskAddress, BigInteger> accountNounces = new HashMap();
-        accountNounces.put(tx.getSender(), BigInteger.valueOf(0));
+        Map<RskAddress, BigInteger> accountNounces = new HashMap<>();
+        accountNounces.put(tx.getSender(signatureCache), BigInteger.valueOf(0));
         Repository repository = Mockito.mock(Repository.class);
 
-        List<Transaction> res = minerUtils.filterTransactions(new LinkedList<>(), txs, accountNounces, repository, ONE_COIN, true);
+        List<Transaction> res = minerUtils.filterTransactions(new LinkedList<>(), txs, accountNounces, repository, ONE_COIN, true, signatureCache);
         Assertions.assertEquals(1, res.size());
     }
 
@@ -116,12 +117,12 @@ void invalidNonceTransactionTest() {
         Transaction tx = Tx.create(config, 0, 50000, 2, 0, 0, 0);
         List<Transaction> txs = new LinkedList<>();
         txs.add(tx);
-        Map<RskAddress, BigInteger> accountNounces = new HashMap();
-        accountNounces.put(tx.getSender(), BigInteger.valueOf(0));
+        Map<RskAddress, BigInteger> accountNounces = new HashMap<>();
+        accountNounces.put(tx.getSender(signatureCache), BigInteger.valueOf(0));
         Repository repository = Mockito.mock(Repository.class);
 
         List<Transaction> txsToRemove = new LinkedList<>();
-        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, ONE_COIN, true);
+        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, ONE_COIN, true, signatureCache);
         Assertions.assertEquals(0, res.size());
         Assertions.assertEquals(0, txsToRemove.size());
     }
@@ -131,14 +132,14 @@ void invalidGasPriceTransactionTest() {
         Transaction tx = Tx.create(config, 0, 50000, 1, 0, 0, 0);
         List<Transaction> txs = new LinkedList<>();
         txs.add(tx);
-        Map<RskAddress, BigInteger> accountNounces = new HashMap();
+        Map<RskAddress, BigInteger> accountNounces = new HashMap<>();
         byte[] addressBytes = ByteUtil.leftPadBytes(BigInteger.valueOf(new Random(0).nextLong()).toByteArray(), 20);
         accountNounces.put(new RskAddress(addressBytes), BigInteger.valueOf(0));
         Repository repository = Mockito.mock(Repository.class);
         Coin minGasPrice = Coin.valueOf(2L);
 
         LinkedList<Transaction> txsToRemove = new LinkedList<>();
-        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, minGasPrice, true);
+        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, minGasPrice, true, signatureCache);
         Assertions.assertEquals(0, res.size());
         Assertions.assertEquals(1, txsToRemove.size());
     }
@@ -149,14 +150,14 @@ void harmfulTransactionTest() {
         List<Transaction> txs = new LinkedList<>();
         txs.add(tx);
         Mockito.when(tx.getGasPrice()).thenReturn(null);
-        Map<RskAddress, BigInteger> accountNounces = new HashMap();
+        Map<RskAddress, BigInteger> accountNounces = new HashMap<>();
         byte[] addressBytes = ByteUtil.leftPadBytes(BigInteger.valueOf(new Random(0).nextLong()).toByteArray(), 20);
         accountNounces.put(new RskAddress(addressBytes), BigInteger.valueOf(0));
         Repository repository = Mockito.mock(Repository.class);
         Coin minGasPrice = Coin.valueOf(2L);
 
         LinkedList<Transaction> txsToRemove = new LinkedList<>();
-        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, minGasPrice, true);
+        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, minGasPrice, true, signatureCache);
         Assertions.assertEquals(0, res.size());
         Assertions.assertEquals(1, txsToRemove.size());
     }
@@ -173,12 +174,12 @@ void filterTransactions_whenRskip252DisabledThenTxIncludedRegardlessGasPrice() {
         txs.add(txLessGasPriceThanCap);
         txs.add(txMoreGasPriceThanCap);
         Map<RskAddress, BigInteger> accountNounces = new HashMap<>();
-        accountNounces.put(txLessGasPriceThanCap.getSender(), BigInteger.ZERO);
-        accountNounces.put(txMoreGasPriceThanCap.getSender(), BigInteger.ZERO);
+        accountNounces.put(txLessGasPriceThanCap.getSender(signatureCache), BigInteger.ZERO);
+        accountNounces.put(txMoreGasPriceThanCap.getSender(signatureCache), BigInteger.ZERO);
         Repository repository = Mockito.mock(Repository.class);
 
         LinkedList<Transaction> txsToRemove = new LinkedList<>();
-        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, minGasPrice, false);
+        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, minGasPrice, false, signatureCache);
 
         Assertions.assertEquals(2, res.size());
         Assertions.assertEquals(0, txsToRemove.size());
@@ -196,12 +197,12 @@ void filterTransactions_whenRskip252EnabledThenTxWithMoreGasPriceThanCapExcluded
         txs.add(txLessGasPriceThanCap);
         txs.add(txMoreGasPriceThanCap);
         Map<RskAddress, BigInteger> accountNounces = new HashMap<>();
-        accountNounces.put(txLessGasPriceThanCap.getSender(), BigInteger.ZERO);
-        accountNounces.put(txMoreGasPriceThanCap.getSender(), BigInteger.ZERO);
+        accountNounces.put(txLessGasPriceThanCap.getSender(signatureCache), BigInteger.ZERO);
+        accountNounces.put(txMoreGasPriceThanCap.getSender(signatureCache), BigInteger.ZERO);
         Repository repository = Mockito.mock(Repository.class);
 
         LinkedList<Transaction> txsToRemove = new LinkedList<>();
-        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, minGasPrice, true);
+        List<Transaction> res = minerUtils.filterTransactions(txsToRemove, txs, accountNounces, repository, minGasPrice, true, signatureCache);
 
         Assertions.assertEquals(1, res.size());
         Assertions.assertEquals(txLessGasPriceThanCap, res.get(0));
@@ -224,19 +225,19 @@ void getAllTransactionsCheckOrderTest() {
         byte[] nonce2 = ByteUtil.cloneBytes(BigInteger.valueOf(2).toByteArray());
 
         byte[] addressBytes = ByteUtil.leftPadBytes(BigInteger.valueOf(new Random(0).nextLong()).toByteArray(), 20);
-        Mockito.when(tx0.getSender()).thenReturn(new RskAddress(addressBytes));
+        Mockito.when(tx0.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes));
         Mockito.when(tx0.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce0));
         Mockito.when(tx0.getGasPrice()).thenReturn(Coin.valueOf(10));
 
-        Mockito.when(tx1.getSender()).thenReturn(new RskAddress(addressBytes));
+        Mockito.when(tx1.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes));
         Mockito.when(tx1.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce0));
         Mockito.when(tx1.getGasPrice()).thenReturn(Coin.valueOf(1));
 
-        Mockito.when(tx2.getSender()).thenReturn(new RskAddress(addressBytes));
+        Mockito.when(tx2.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes));
         Mockito.when(tx2.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce1));
         Mockito.when(tx2.getGasPrice()).thenReturn(Coin.valueOf(10));
 
-        Mockito.when(tx3.getSender()).thenReturn(new RskAddress(addressBytes));
+        Mockito.when(tx3.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes));
         Mockito.when(tx3.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce2));
         Mockito.when(tx3.getGasPrice()).thenReturn(Coin.valueOf(100));
 
@@ -248,7 +249,7 @@ void getAllTransactionsCheckOrderTest() {
 
         Mockito.when(transactionPool.getPendingTransactions()).thenReturn(txs);
 
-        List<Transaction> res = minerUtils.getAllTransactions(transactionPool);
+        List<Transaction> res = minerUtils.getAllTransactions(transactionPool, signatureCache);
 
         Assertions.assertEquals(2, res.size());
         Assertions.assertEquals(res.get(0).getGasPrice(), Coin.valueOf(10));
@@ -262,7 +263,7 @@ void getAllTransactionsCheckOrderTest() {
 
         Mockito.when(transactionPool.getPendingTransactions()).thenReturn(txs);
 
-        res = minerUtils.getAllTransactions(transactionPool);
+        res = minerUtils.getAllTransactions(transactionPool, signatureCache);
 
         Assertions.assertEquals(3, res.size());
         Assertions.assertEquals(res.get(0).getNonce(), tx1.getNonce());
@@ -278,15 +279,15 @@ void getAllTransactionsCheckOrderTest() {
         Transaction tx6 = Mockito.mock(Transaction.class);
 
         byte[] addressBytes2 = ByteUtil.leftPadBytes(BigInteger.valueOf(new Random(100).nextLong()).toByteArray(), 20);
-        Mockito.when(tx4.getSender()).thenReturn(new RskAddress(addressBytes2));
+        Mockito.when(tx4.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes2));
         Mockito.when(tx4.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce0));
         Mockito.when(tx4.getGasPrice()).thenReturn(Coin.valueOf(50));
 
-        Mockito.when(tx5.getSender()).thenReturn(new RskAddress(addressBytes2));
+        Mockito.when(tx5.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes2));
         Mockito.when(tx5.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce1));
         Mockito.when(tx5.getGasPrice()).thenReturn(Coin.valueOf(1000));
 
-        Mockito.when(tx6.getSender()).thenReturn(new RskAddress(addressBytes2));
+        Mockito.when(tx6.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes2));
         Mockito.when(tx6.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce2));
         Mockito.when(tx6.getGasPrice()).thenReturn(Coin.valueOf(1));
 
@@ -297,7 +298,7 @@ void getAllTransactionsCheckOrderTest() {
 
         Mockito.when(transactionPool.getPendingTransactions()).thenReturn(txs);
 
-        res = minerUtils.getAllTransactions(transactionPool);
+        res = minerUtils.getAllTransactions(transactionPool, signatureCache);
 
         Assertions.assertEquals(6, res.size());
         Assertions.assertEquals(res.get(0).getGasPrice(), Coin.valueOf(50));
@@ -312,15 +313,15 @@ void getAllTransactionsCheckOrderTest() {
         Transaction tx9 = Mockito.mock(Transaction.class);
 
         byte[] addressBytes3 = ByteUtil.leftPadBytes(BigInteger.valueOf(new Random(1000).nextLong()).toByteArray(), 20);
-        Mockito.when(tx7.getSender()).thenReturn(new RskAddress(addressBytes3));
+        Mockito.when(tx7.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes3));
         Mockito.when(tx7.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce0));
         Mockito.when(tx7.getGasPrice()).thenReturn(Coin.valueOf(500));
 
-        Mockito.when(tx8.getSender()).thenReturn(new RskAddress(addressBytes3));
+        Mockito.when(tx8.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes3));
         Mockito.when(tx8.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce1));
         Mockito.when(tx8.getGasPrice()).thenReturn(Coin.valueOf(500));
 
-        Mockito.when(tx9.getSender()).thenReturn(new RskAddress(addressBytes3));
+        Mockito.when(tx9.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(addressBytes3));
         Mockito.when(tx9.getNonce()).thenReturn(ByteUtil.cloneBytes(nonce2));
         Mockito.when(tx9.getGasPrice()).thenReturn(Coin.valueOf(2000));
 
@@ -330,7 +331,7 @@ void getAllTransactionsCheckOrderTest() {
 
         Mockito.when(transactionPool.getPendingTransactions()).thenReturn(txs);
 
-        res = minerUtils.getAllTransactions(transactionPool);
+        res = minerUtils.getAllTransactions(transactionPool, signatureCache);
 
         Assertions.assertEquals(9, res.size());
         Assertions.assertEquals(res.get(0).getGasPrice(), Coin.valueOf(500));
diff --git a/rskj-core/src/test/java/co/rsk/mine/TransactionModuleTest.java b/rskj-core/src/test/java/co/rsk/mine/TransactionModuleTest.java
index 450bb7c18a9..3c49428e1c3 100644
--- a/rskj-core/src/test/java/co/rsk/mine/TransactionModuleTest.java
+++ b/rskj-core/src/test/java/co/rsk/mine/TransactionModuleTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.mine;
 
 import co.rsk.config.ConfigUtils;
@@ -86,6 +85,7 @@
 class TransactionModuleTest {
     private final TestSystemProperties config = new TestSystemProperties();
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
+    private final SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
     private TransactionExecutorFactory transactionExecutorFactory;
 
     @Test
@@ -608,7 +608,8 @@ private Web3Impl internalCreateEnvironment(Blockchain blockchain,
                         blockFactory,
                         blockExecutor,
                         new MinimumGasPriceCalculator(Coin.valueOf(miningConfig.getMinGasPriceTarget())),
-                        new MinerUtils()
+                        new MinerUtils(),
+                        new BlockTxSignatureCache(new ReceivedTxSignatureCache())
                 ),
                 minerClock,
                 blockFactory,
@@ -640,10 +641,10 @@ reversibleTransactionExecutor1, new ExecutionBlockRetriever(blockchain, null, nu
                 repositoryLocator, new EthModuleWalletEnabled(wallet), transactionModule,
                 new BridgeSupportFactory(
                         btcBlockStoreFactory, config.getNetworkConstants().getBridgeConstants(),
-                        config.getActivationConfig()),
+                        config.getActivationConfig(), signatureCache),
                 config.getGasEstimationCap()
         );
-        TxPoolModule txPoolModule = new TxPoolModuleImpl(transactionPool);
+        TxPoolModule txPoolModule = new TxPoolModuleImpl(transactionPool, new ReceivedTxSignatureCache());
         DebugModule debugModule = new DebugModuleImpl(null, null, Web3Mocks.getMockMessageHandler(), null, null);
 
         ChannelManager channelManager = new SimpleChannelManager();
@@ -672,6 +673,7 @@ repositoryLocator, new EthModuleWalletEnabled(wallet), transactionModule,
                 null,
                 null,
                 null,
+                null,
                 null);
     }
 
@@ -689,7 +691,7 @@ private TransactionExecutorFactory buildTransactionExecutorFactory(BlockStore bl
                 receiptStore,
                 blockFactory,
                 null,
-                new PrecompiledContracts(config, bridgeSupportFactory()),
+                new PrecompiledContracts(config, bridgeSupportFactory(), signatureCache),
                 blockTxSignatureCache
         );
     }
@@ -701,7 +703,7 @@ private TransactionExecutorFactory buildTransactionExecutionFactoryWithProgramIn
                 receiptStore,
                 blockFactory,
                 new ProgramInvokeFactoryImpl(),
-                new PrecompiledContracts(config, bridgeSupportFactory()),
+                new PrecompiledContracts(config, bridgeSupportFactory(), signatureCache),
                 blockTxSignatureCache
         );
     }
@@ -710,7 +712,7 @@ private BridgeSupportFactory bridgeSupportFactory() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                 config.getNetworkConstants().getBridgeConstants(),
-                config.getActivationConfig());
+                config.getActivationConfig(), signatureCache);
         return bridgeSupportFactory;
     }
 }
diff --git a/rskj-core/src/test/java/co/rsk/net/SyncProcessorTest.java b/rskj-core/src/test/java/co/rsk/net/SyncProcessorTest.java
index 085154e6b9e..212c1bc8fad 100644
--- a/rskj-core/src/test/java/co/rsk/net/SyncProcessorTest.java
+++ b/rskj-core/src/test/java/co/rsk/net/SyncProcessorTest.java
@@ -777,11 +777,13 @@ void processBodyResponseWithTransactionAddsToBlockchain() {
 
         Block block = new BlockGenerator().createChildBlock(genesis, txs, blockChainBuilder.getRepository().getRoot());
 
+        SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+
         StateRootHandler stateRootHandler = new StateRootHandler(config.getActivationConfig(), new StateRootsStoreImpl(new HashMapDB()));
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                 config.getNetworkConstants().getBridgeConstants(),
-                config.getActivationConfig());
+                config.getActivationConfig(), signatureCache);
 
         BlockExecutor blockExecutor = new BlockExecutor(
                 config.getActivationConfig(),
@@ -792,7 +794,7 @@ void processBodyResponseWithTransactionAddsToBlockchain() {
                         null,
                         blockFactory,
                         new ProgramInvokeFactoryImpl(),
-                        new PrecompiledContracts(config, bridgeSupportFactory),
+                        new PrecompiledContracts(config, bridgeSupportFactory, signatureCache),
                         new BlockTxSignatureCache(new ReceivedTxSignatureCache())
                 )
         );
diff --git a/rskj-core/src/test/java/co/rsk/net/handler/quota/TxQuotaCheckerIntegrationTest.java b/rskj-core/src/test/java/co/rsk/net/handler/quota/TxQuotaCheckerIntegrationTest.java
index 389207fc25b..c5216ec746e 100644
--- a/rskj-core/src/test/java/co/rsk/net/handler/quota/TxQuotaCheckerIntegrationTest.java
+++ b/rskj-core/src/test/java/co/rsk/net/handler/quota/TxQuotaCheckerIntegrationTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.net.handler.quota;
 
 import co.rsk.core.Coin;
@@ -112,7 +111,7 @@ void setUp() {
 
         timeProvider = mock(TimeProvider.class);
 
-        quotaChecker = new TxQuotaChecker(timeProvider);
+        quotaChecker = new TxQuotaChecker(timeProvider, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         // 3 items to facilitate testing
         TestUtils.setInternalState(quotaChecker, "accountQuotas", new MaxSizeHashMap<>(3, true));
diff --git a/rskj-core/src/test/java/co/rsk/net/handler/quota/TxQuotaTest.java b/rskj-core/src/test/java/co/rsk/net/handler/quota/TxQuotaTest.java
index 54b5bc6dd5b..b18df2ae260 100644
--- a/rskj-core/src/test/java/co/rsk/net/handler/quota/TxQuotaTest.java
+++ b/rskj-core/src/test/java/co/rsk/net/handler/quota/TxQuotaTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.net.handler.quota;
 
 import co.rsk.core.RskAddress;
diff --git a/rskj-core/src/test/java/co/rsk/net/handler/quota/TxVirtualGasCalculatorTest.java b/rskj-core/src/test/java/co/rsk/net/handler/quota/TxVirtualGasCalculatorTest.java
index 8bced1b346a..e54ddd6faf5 100644
--- a/rskj-core/src/test/java/co/rsk/net/handler/quota/TxVirtualGasCalculatorTest.java
+++ b/rskj-core/src/test/java/co/rsk/net/handler/quota/TxVirtualGasCalculatorTest.java
@@ -15,16 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.net.handler.quota;
 
-import co.rsk.core.RskAddress;
 import co.rsk.test.builders.AccountBuilder;
 import co.rsk.test.builders.TransactionBuilder;
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.core.Account;
 import org.ethereum.core.Transaction;
-import org.ethereum.crypto.ECKey;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -69,7 +66,6 @@ private static Transaction tx(long nonce, long gasLimit, long gasPrice, long siz
                 .build();
 
         Transaction mockedTx = spy(transaction);
-        when(mockedTx.getSender()).thenReturn(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(1)).getAddress()));
         when(mockedTx.getSize()).thenReturn(size);
 
         return mockedTx;
diff --git a/rskj-core/src/test/java/co/rsk/net/handler/txvalidator/TxValidatorIntrinsicGasLimitValidatorTest.java b/rskj-core/src/test/java/co/rsk/net/handler/txvalidator/TxValidatorIntrinsicGasLimitValidatorTest.java
index 7a0c735180c..2a0d62769a4 100644
--- a/rskj-core/src/test/java/co/rsk/net/handler/txvalidator/TxValidatorIntrinsicGasLimitValidatorTest.java
+++ b/rskj-core/src/test/java/co/rsk/net/handler/txvalidator/TxValidatorIntrinsicGasLimitValidatorTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.net.handler.txvalidator;
 
 import co.rsk.config.BridgeRegTestConstants;
@@ -25,6 +24,8 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
 import org.ethereum.core.AccountState;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.vm.PrecompiledContracts;
@@ -94,7 +95,7 @@ void validIntrinsicGasPrice() {
         BridgeRegTestConstants bridgeRegTestConstants = BridgeRegTestConstants.getInstance();
         tx4.sign(BridgeRegTestConstants.REGTEST_FEDERATION_PRIVATE_KEYS.get(0).getPrivKeyBytes());
 
-        TxValidatorIntrinsicGasLimitValidator tvigpv = new TxValidatorIntrinsicGasLimitValidator(constants, activationConfig);
+        TxValidatorIntrinsicGasLimitValidator tvigpv = new TxValidatorIntrinsicGasLimitValidator(constants, activationConfig, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         Assertions.assertTrue(tvigpv.validate(tx1, new AccountState(), null, null, Long.MAX_VALUE, false).transactionIsValid());
         Assertions.assertTrue(tvigpv.validate(tx2, new AccountState(), null, null, Long.MAX_VALUE, false).transactionIsValid());
@@ -150,7 +151,7 @@ void invalidIntrinsicGasPrice() {
                 .build();
         tx4.sign(new ECKey().getPrivKeyBytes());
 
-        TxValidatorIntrinsicGasLimitValidator tvigpv = new TxValidatorIntrinsicGasLimitValidator(constants, activationConfig);
+        TxValidatorIntrinsicGasLimitValidator tvigpv = new TxValidatorIntrinsicGasLimitValidator(constants, activationConfig, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         Assertions.assertFalse(tvigpv.validate(tx1, new AccountState(), null, null, Long.MAX_VALUE, false).transactionIsValid());
         Assertions.assertFalse(tvigpv.validate(tx2, new AccountState(), null, null, Long.MAX_VALUE, false).transactionIsValid());
diff --git a/rskj-core/src/test/java/co/rsk/pcc/AltBN128Test.java b/rskj-core/src/test/java/co/rsk/pcc/AltBN128Test.java
index 1d5e932cb8e..6e7177e80a1 100644
--- a/rskj-core/src/test/java/co/rsk/pcc/AltBN128Test.java
+++ b/rskj-core/src/test/java/co/rsk/pcc/AltBN128Test.java
@@ -30,6 +30,9 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
 import org.ethereum.core.BlockFactory;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.PrecompiledContracts;
@@ -67,6 +70,7 @@ class AltBN128Test {
     private TestSystemProperties config;
     private PrecompiledContracts precompiledContracts;
     private ActivationConfig.ForBlock activations;
+    private SignatureCache signatureCache;
 
     private static final int ADD_GAS_COST = 150;
     private static final int MUL_GAS_COST = 6000;
@@ -74,7 +78,8 @@ class AltBN128Test {
     @BeforeEach
     void init() {
         config = new TestSystemProperties();
-        precompiledContracts = new PrecompiledContracts(config, null);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+        precompiledContracts = new PrecompiledContracts(config, null, signatureCache);
         activations = mock(ActivationConfig.ForBlock.class);
 
         when(activations.isActive(ConsensusRule.RSKIP137)).thenReturn(true);
@@ -796,7 +801,7 @@ private Program executeCode(String code) {
         byte[] compiledCode = compiler.compile(code);
         VM vm = new VM(vmConfig, precompiledContracts);
         Program program = new Program(vmConfig, precompiledContracts, blockFactory,
-                activations, compiledCode, invoke, null, new HashSet<>());
+                activations, compiledCode, invoke, null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         vm.play(program);
 
diff --git a/rskj-core/src/test/java/co/rsk/pcc/blockheader/BlockHeaderContractTest.java b/rskj-core/src/test/java/co/rsk/pcc/blockheader/BlockHeaderContractTest.java
index 4637e357545..07482a879b2 100644
--- a/rskj-core/src/test/java/co/rsk/pcc/blockheader/BlockHeaderContractTest.java
+++ b/rskj-core/src/test/java/co/rsk/pcc/blockheader/BlockHeaderContractTest.java
@@ -41,10 +41,7 @@
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.CallTransaction;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.DataWord;
@@ -93,12 +90,14 @@ class BlockHeaderContractTest {
     private CallTransaction.Function getDifficultyFunction;
     private CallTransaction.Function getBitcoinHeaderFunction;
     private CallTransaction.Function getUncleCoinbaseAddressFunction;
+    private SignatureCache signatureCache;
 
     @BeforeEach
     void setUp() {
         config = new TestSystemProperties();
         blockFactory = new BlockFactory(config.getActivationConfig());
-        PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+        PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, signatureCache);
 
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
 
diff --git a/rskj-core/src/test/java/co/rsk/peg/AddressBasedAuthorizerTest.java b/rskj-core/src/test/java/co/rsk/peg/AddressBasedAuthorizerTest.java
index 74197141a58..4909b4e1d0a 100644
--- a/rskj-core/src/test/java/co/rsk/peg/AddressBasedAuthorizerTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/AddressBasedAuthorizerTest.java
@@ -19,6 +19,9 @@
 package co.rsk.peg;
 
 import co.rsk.core.RskAddress;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.crypto.ECKey;
 import org.junit.jupiter.api.Assertions;
@@ -27,6 +30,7 @@
 import java.math.BigInteger;
 import java.util.Arrays;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -80,14 +84,14 @@ void isAuthorized() {
 
         for (long n = 100L; n <= 102L; n++) {
             Transaction mockedTx = mock(Transaction.class);
-            when(mockedTx.getSender()).thenReturn(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(n)).getAddress()));
+            when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(n)).getAddress()));
             Assertions.assertTrue(auth.isAuthorized(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(n)).getAddress())));
-            Assertions.assertTrue(auth.isAuthorized(mockedTx));
+            Assertions.assertTrue(auth.isAuthorized(mockedTx, new BlockTxSignatureCache(new ReceivedTxSignatureCache())));
         }
 
         Assertions.assertFalse(auth.isAuthorized(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(50L)).getAddress())));
         Transaction mockedTx = mock(Transaction.class);
-        when(mockedTx.getSender()).thenReturn(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(50L)).getAddress()));
-        Assertions.assertFalse(auth.isAuthorized(mockedTx));
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(50L)).getAddress()));
+        Assertions.assertFalse(auth.isAuthorized(mockedTx, new BlockTxSignatureCache(new ReceivedTxSignatureCache())));
     }
 }
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeCostsTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeCostsTest.java
index 24ec872d7cf..be27fcc3620 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeCostsTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeCostsTest.java
@@ -31,8 +31,8 @@ class BridgeCostsTest {
     private TestSystemProperties config = new TestSystemProperties();
     private Constants constants;
     private ActivationConfig activationConfig;
-    private BtcBlockStoreWithCache.Factory btcBlockFactory;
     private BridgeSupportFactory bridgeSupportFactory;
+    private SignatureCache signatureCache;
 
     @BeforeAll
      static void setUpBeforeClass() {
@@ -46,10 +46,11 @@ void resetConfigToRegTest() {
         when(config.getNetworkConstants()).thenReturn(constants);
         activationConfig = spy(ActivationConfigsForTest.genesis());
         when(config.getActivationConfig()).thenReturn(activationConfig);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
         bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig, signatureCache);
     }
 
     @Test
@@ -58,7 +59,7 @@ void receiveHeadersGasCost_beforeDynamicCost() {
 
         Transaction txMock = mock(Transaction.class);
         when(txMock.getReceiveAddress()).thenReturn(RskAddress.nullAddress());
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory, signatureCache);
         bridge.init(txMock, getGenesisBlock(), null, null, null, null);
 
         for (int numberOfHeaders = 0; numberOfHeaders < 10; numberOfHeaders++) {
@@ -77,7 +78,7 @@ void receiveHeadersGasCost_afterDynamicCost() {
 
         Transaction txMock = mock(Transaction.class);
         when(txMock.getReceiveAddress()).thenReturn(RskAddress.nullAddress());
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory, signatureCache);
         bridge.init(txMock, getGenesisBlock(), null, null, null, null);
 
         final long BASE_COST = 66_000L;
@@ -102,7 +103,7 @@ void receiveHeadersGasCost_afterDynamicCost_review() {
 
         Transaction txMock = mock(Transaction.class);
         when(txMock.getReceiveAddress()).thenReturn(RskAddress.nullAddress());
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory, signatureCache);
         bridge.init(txMock, getGenesisBlock(), null, null, null, null);
 
         final long BASE_COST = 25_000L;
@@ -127,8 +128,9 @@ void getGasForDataFreeTx() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory);
+                activationConfig,
+                signatureCache);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory, signatureCache);
 
         org.ethereum.core.Transaction rskTx = CallTransaction.createCallTransaction(
                 0,
@@ -214,8 +216,9 @@ private void getGasForDataPaidTx(int expected, CallTransaction.Function function
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory);
+                activationConfig,
+                signatureCache);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory, signatureCache);
         org.ethereum.core.Transaction rskTx;
         if (function==null) {
             rskTx = CallTransaction.createRawTransaction(
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeRSKIP220NewMethodsTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeRSKIP220NewMethodsTest.java
index 55259c6601b..4a4055fd347 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeRSKIP220NewMethodsTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeRSKIP220NewMethodsTest.java
@@ -7,6 +7,9 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
 import org.ethereum.core.Block;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.vm.exception.VMException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -28,6 +31,7 @@ class BridgeRSKIP220NewMethodsTest {
     private BridgeSupportFactory bridgeSupportFactory;
     private Block rskExecutionBlock;
     private Bridge bridge;
+    private SignatureCache signatureCache;
 
     @BeforeEach
     void beforeEach() {
@@ -41,12 +45,14 @@ void beforeEach() {
         when(bridgeSupportFactory.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupport);
         rskExecutionBlock = mock(Block.class);
         when(rskExecutionBlock.getNumber()).thenReturn(42L);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
 
         bridge = new Bridge(
                 null,
                 constants,
                 activationConfig,
-                bridgeSupportFactory
+                bridgeSupportFactory,
+                signatureCache
         );
 
         bridge.init(null, rskExecutionBlock, null, null, null, null);
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportAddSignatureTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportAddSignatureTest.java
index 4fee889aa15..b3abbf48e58 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportAddSignatureTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportAddSignatureTest.java
@@ -6,8 +6,7 @@
 
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.Repository;
+import org.ethereum.core.*;
 import org.ethereum.util.RLP;
 import org.ethereum.util.RLPList;
 import org.ethereum.vm.LogInfo;
@@ -46,7 +45,6 @@
 import static org.hamcrest.core.IsNot.not;
 import static org.mockito.Mockito.*;
 
-
 class BridgeSupportAddSignatureTest extends BridgeSupportTestBase {
 
     protected ActivationConfig.ForBlock activationsBeforeForks;
@@ -91,6 +89,7 @@ void addSignature_fedPubKey_belongs_to_active_federation() throws Exception {
                 new Context(bridgeConstantsRegtest.getBtcParams()),
                 mockFederationSupport,
                 null,
+                null,
                 null
         );
 
@@ -119,6 +118,7 @@ void addSignature_fedPubKey_belongs_to_retiring_federation() throws Exception {
                 new Context(bridgeConstantsRegtest.getBtcParams()),
                 mockFederationSupport,
                 null,
+                null,
                 null
         );
 
@@ -175,6 +175,7 @@ void addSignature_fedPubKey_no_belong_to_retiring_or_active_federation() throws
                 new Context(bridgeConstantsRegtest.getBtcParams()),
                 mockFederationSupport,
                 null,
+                null,
                 null
         );
 
@@ -458,9 +459,11 @@ void addSignatureMultipleInputsPartiallyValid() throws Exception {
         provider.getRskTxsWaitingForSignatures().put(keccak256, t);
         provider.save();
 
+        SignatureCache signatureCache = new ReceivedTxSignatureCache();
+
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         List<LogInfo> logs = new ArrayList<>();
-        BridgeEventLogger eventLogger = new BrigeEventLoggerLegacyImpl(bridgeConstantsRegtest, activations, logs);
+        BridgeEventLogger eventLogger = new BrigeEventLoggerLegacyImpl(bridgeConstantsRegtest, activations, logs, signatureCache);
 
         BridgeSupport bridgeSupport = bridgeSupportBuilder
                 .withBridgeConstants(bridgeConstantsRegtest)
@@ -565,10 +568,12 @@ private void addSignatureFromValidFederator(List<BtcECKey> privateKeysToSignWith
         provider.save();
         track.commit();
 
+        SignatureCache signatureCache = new ReceivedTxSignatureCache();
+
         track = repository.startTracking();
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         List<LogInfo> logs = new ArrayList<>();
-        BridgeEventLogger eventLogger = new BrigeEventLoggerLegacyImpl(bridgeConstantsRegtest, activations, logs);
+        BridgeEventLogger eventLogger = new BrigeEventLoggerLegacyImpl(bridgeConstantsRegtest, activations, logs, signatureCache);
 
         BridgeSupport bridgeSupport = bridgeSupportBuilder
                 .withBridgeConstants(bridgeConstantsRegtest)
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java
index 976402d13fc..d294b22130e 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of RskJ
+ * Copyright (C) 2017 RSK Labs Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package co.rsk.peg;
 
 import co.rsk.bitcoinj.core.Address;
@@ -30,9 +47,7 @@
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.PrecompiledContracts;
@@ -68,9 +83,13 @@
 import static org.mockito.Mockito.when;
 
 class BridgeSupportFlyoverTest extends BridgeSupportTestBase {
+
+    private SignatureCache signatureCache;
+
     @BeforeEach
     void setUpOnEachTest() {
         activations = mock(ActivationConfig.ForBlock.class);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(true);
         when(activations.isActive(ConsensusRule.RSKIP219)).thenReturn(true);
         bridgeSupportBuilder = new BridgeSupportBuilder();
@@ -179,6 +198,7 @@ private BigInteger sendFundsToActiveFederation(
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -321,6 +341,7 @@ private BigInteger sendFundsToRetiringFederation(
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -472,6 +493,7 @@ private BigInteger sendFundsToActiveAndRetiringFederation(
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -635,6 +657,7 @@ private BigInteger sendFundsToAnyAddress(
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -764,6 +787,7 @@ private BigInteger sendFundsSurpassesLockingCapToAnyAddress(
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -1680,6 +1704,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_already_saved_in_
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -1873,6 +1898,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_surpassing_lockin
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -2066,6 +2092,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_surpassing_lockin
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -2245,6 +2272,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_without_witness_surpassing_loc
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -2411,6 +2439,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_without_witness_surpassing_loc
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -2583,6 +2612,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_without_witness_already_saved_
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -2687,6 +2717,7 @@ void registerFlyoverBtcTransaction_sender_is_not_lbc()
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -2737,6 +2768,7 @@ void registerFlyoverBtcTransaction_validationsForRegisterBtcTransaction_returns_
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -2777,7 +2809,8 @@ void registerFlyoverBtcTransaction_amount_sent_is_0()
             btcContext,
             mock(FederationSupport.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         ));
 
         doReturn(bridgeConstantsRegtest.getGenesisFederation()).when(bridgeSupport).getActiveFederation();
@@ -2801,6 +2834,7 @@ void registerFlyoverBtcTransaction_amount_sent_is_0()
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -2851,7 +2885,8 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_t
             btcContext,
             mock(FederationSupport.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         ));
 
         doReturn(bridgeConstantsRegtest.getGenesisFederation()).when(bridgeSupport).getActiveFederation();
@@ -2884,6 +2919,7 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_t
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -2936,7 +2972,8 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_f
             btcContext,
             mock(FederationSupport.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         ));
 
         doReturn(bridgeConstantsRegtest.getGenesisFederation()).when(bridgeSupport).getActiveFederation();
@@ -2969,6 +3006,7 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_f
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -3022,7 +3060,8 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_tries_to_register_a
             btcContext,
             mock(FederationSupport.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         ));
 
         doReturn(bridgeConstantsRegtest.getGenesisFederation()).when(bridgeSupport).getActiveFederation();
@@ -3058,6 +3097,7 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_tries_to_register_a
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -3126,7 +3166,8 @@ void registerFlyoverBtcTransaction_OK()
             btcContext,
             federationSupportMock,
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         ));
 
         doReturn(bridgeConstantsRegtest.getGenesisFederation()).when(bridgeSupport).getActiveFederation();
@@ -3158,6 +3199,7 @@ void registerFlyoverBtcTransaction_OK()
             null,
             null,
             null,
+            null,
             null
         );
 
@@ -3230,7 +3272,8 @@ void createFlyoverFederationInformation_OK() {
             mock(Context.class),
             federationSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         Script flyoverRedeemScript = FastBridgeRedeemScriptParser.createMultiSigFastBridgeRedeemScript(
@@ -3275,7 +3318,8 @@ void getFlyoverWallet_ok() {
             btcContext,
             mock(FederationSupport.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         Federation fed = bridgeConstantsRegtest.getGenesisFederation();
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportRSKIP220NewMethodsTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportRSKIP220NewMethodsTest.java
index 4424640a5db..9b77f23bb74 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportRSKIP220NewMethodsTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportRSKIP220NewMethodsTest.java
@@ -4,14 +4,10 @@
 import co.rsk.bitcoinj.store.BlockStoreException;
 import co.rsk.config.BridgeConstants;
 import co.rsk.config.BridgeRegTestConstants;
-import co.rsk.peg.btcLockSender.BtcLockSenderProvider;
-import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
-import co.rsk.peg.utils.BridgeEventLogger;
 import co.rsk.test.builders.BridgeSupportBuilder;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
-import org.ethereum.core.Block;
-import org.ethereum.core.Repository;
+import org.ethereum.core.*;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -38,6 +34,7 @@ class BridgeSupportRSKIP220NewMethodsTest {
     private StoredBlock storedBlock;
     private BtcBlock btcBlock;
     private BridgeSupport bridgeSupport;
+    private SignatureCache signatureCache;
 
     @BeforeEach
     void setUpOnEachTest() throws BlockStoreException {
@@ -45,6 +42,7 @@ void setUpOnEachTest() throws BlockStoreException {
         btcParams = bridgeConstants.getBtcParams();
         activationsBeforeForks = ActivationConfigsForTest.genesis().forBlock(0);
         activationsAfterForks = ActivationConfigsForTest.all().forBlock(0);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
 
         hashBytes = new byte[32];
         random.nextBytes(hashBytes);
@@ -74,6 +72,7 @@ void setUpOnEachTest() throws BlockStoreException {
             .withBridgeConstants(bridgeConstants)
             .withBtcBlockStoreFactory(btcBlockStoreFactory)
             .withActivations(activationsAfterForks)
+            .withSignatureCache(signatureCache)
             .build();
     }
 
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportReleaseBtcTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportReleaseBtcTest.java
index fda581b4ccf..c49bc0e122a 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportReleaseBtcTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportReleaseBtcTest.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of RskJ
+ * Copyright (C) 2017 RSK Labs Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package co.rsk.peg;
 
 import co.rsk.bitcoinj.core.*;
@@ -17,10 +34,7 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.CallTransaction;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.db.MutableRepository;
@@ -64,9 +78,11 @@ class BridgeSupportReleaseBtcTest {
     private BridgeSupport bridgeSupport;
     private Transaction releaseTx;
     private BridgeSupportBuilder bridgeSupportBuilder;
+    private SignatureCache signatureCache;
 
     @BeforeEach
     void setUpOnEachTest() throws IOException {
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
         bridgeConstants = BridgeRegTestConstants.getInstance();
         activationsBeforeForks = ActivationConfigsForTest.genesis().forBlock(0);
         activeFederation = getFederation();
@@ -190,7 +206,7 @@ void handmade_release_after_rskip_146() throws IOException {
         when(activationMock.isActive(ConsensusRule.RSKIP185)).thenReturn(false);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         bridgeSupport.releaseBtc(releaseTx);
@@ -216,7 +232,7 @@ void handmade_release_after_rskip_146_185() throws IOException {
         when(activationMock.isActive(ConsensusRule.RSKIP326)).thenReturn(false);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         bridgeSupport.releaseBtc(releaseTx);
@@ -253,7 +269,7 @@ void handmade_release_after_rskip_146_185_326() throws IOException {
 
         List<LogInfo> logInfo = new ArrayList<>();
 
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         bridgeSupport.releaseBtc(releaseTx);
@@ -290,7 +306,7 @@ void handmade_release_after_rskip_146_rejected_lowAmount() throws IOException {
 
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         releaseTx = buildReleaseRskTx(Coin.ZERO);
@@ -318,7 +334,7 @@ void handmade_release_after_rskip_146_185_rejected_lowAmount() throws IOExceptio
 
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         releaseTx = buildReleaseRskTx(Coin.ZERO);
@@ -351,7 +367,7 @@ void handmade_release_after_rskip_146_185_rejected_contractCaller() throws IOExc
 
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         releaseTx = buildReleaseRskTx_fromContract(Coin.COIN);
@@ -382,7 +398,7 @@ void handmade_release_after_rskip_146_rejected_contractCaller() throws IOExcepti
         when(activationMock.isActive(ConsensusRule.RSKIP185)).thenReturn(false);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo);
+        BridgeEventLoggerImpl eventLogger = new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache);
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         releaseTx = buildReleaseRskTx_fromContract(Coin.COIN);
@@ -401,7 +417,7 @@ void release_after_rskip_219() throws IOException {
         when(activationMock.isActive(ConsensusRule.RSKIP219)).thenReturn(true);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         // Get a value between old and new minimum pegout values
@@ -436,7 +452,7 @@ void release_after_rskip_219_326() throws IOException {
         when(activationMock.isActive(ConsensusRule.RSKIP326)).thenReturn(true);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         // Get a value between old and new minimum pegout values
@@ -469,7 +485,7 @@ void release_before_rskip_219() throws IOException {
         when(activationMock.isActive(ConsensusRule.RSKIP219)).thenReturn(false);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         // Get a value between old and new minimum pegout values
@@ -496,7 +512,7 @@ void release_before_rskip_219_minimum_exclusive() throws IOException {
         when(activationMock.isActive(ConsensusRule.RSKIP219)).thenReturn(false);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         // Get a value exactly to legacy minimum
@@ -520,7 +536,7 @@ void release_after_rskip_219_minimum_inclusive() throws IOException {
         when(activationMock.isActive(ConsensusRule.RSKIP219)).thenReturn(true);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         // Get a value exactly to current minimum
@@ -551,7 +567,7 @@ void release_after_rskip_219_326_minimum_inclusive() throws IOException {
         when(activationMock.isActive(ConsensusRule.RSKIP326)).thenReturn(true);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         // Get a value exactly to current minimum
@@ -1111,7 +1127,7 @@ private void testPegoutMinimumWithFeeVerification(Coin feePerKB, Coin value, boo
         when(activationMock.isActive(ConsensusRule.RSKIP219)).thenReturn(true);
 
         List<LogInfo> logInfo = new ArrayList<>();
-        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo));
+        BridgeEventLoggerImpl eventLogger = spy(new BridgeEventLoggerImpl(bridgeConstants, activationMock, logInfo, signatureCache));
         bridgeSupport = initBridgeSupport(eventLogger, activationMock);
 
         provider.setFeePerKb(feePerKB);
@@ -1190,7 +1206,7 @@ private Transaction buildReleaseRskTx_fromContract(Coin coin) {
         return new InternalTransaction(releaseTx.getHash().getBytes(), 400, 0, NONCE.toByteArray(),
             DataWord.valueOf(GAS_PRICE.intValue()), DataWord.valueOf(GAS_LIMIT.intValue()), SENDER.getAddress(),
             PrecompiledContracts.BRIDGE_ADDR.getBytes(), co.rsk.core.Coin.fromBitcoin(Coin.COIN).getBytes(),
-            Hex.decode(DATA), "");
+            Hex.decode(DATA), "", new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     }
 
     private Transaction buildUpdateTx() {
@@ -1213,6 +1229,7 @@ private BridgeSupport initBridgeSupport(BridgeEventLogger eventLogger, Activatio
             .withRepository(repository)
             .withEventLogger(eventLogger)
             .withActivations(activationMock)
+            .withSignatureCache(signatureCache)
             .build();
     }
 
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
index fee8f658d53..d5255a688ef 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of RskJ
+ * Copyright (C) 2017 RSK Labs Ltd.
+ * (derived from ethereumJ library, Copyright (c) 2016 <ether.camp>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package co.rsk.peg;
 
 import co.rsk.bitcoinj.core.*;
@@ -29,9 +47,7 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.util.ByteUtil;
@@ -78,10 +94,13 @@ class BridgeSupportTest extends BridgeSupportTestBase {
     protected ActivationConfig.ForBlock activationsBeforeForks;
     protected ActivationConfig.ForBlock activationsAfterForks;
 
+    protected SignatureCache signatureCache;
+
     @BeforeEach
     void setUpOnEachTest() {
         activationsBeforeForks = ActivationConfigsForTest.genesis().forBlock(0);
         activationsAfterForks = ActivationConfigsForTest.all().forBlock(0);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
         bridgeSupportBuilder = new BridgeSupportBuilder();
     }
 
@@ -103,9 +122,9 @@ void voteFeePerKbChange_nullFeeThrows() {
         AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
 
         when(provider.getFeePerKbElection(any())).thenReturn(new ABICallElection(null));
-        when(tx.getSender()).thenReturn(new RskAddress(ByteUtil.leftPadBytes(new byte[]{0x43}, 20)));
+        when(tx.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(ByteUtil.leftPadBytes(new byte[]{0x43}, 20)));
         when(constants.getFeePerKbChangeAuthorizer()).thenReturn(authorizer);
-        when(authorizer.isAuthorized(tx)).thenReturn(true);
+        when(authorizer.isAuthorized(eq(tx), any())).thenReturn(true);
 
         BridgeSupport bridgeSupport = bridgeSupportBuilder
             .withBridgeConstants(constants)
@@ -126,9 +145,9 @@ void voteFeePerKbChange_unsuccessfulVote_unauthorized() {
         byte[] senderBytes = ByteUtil.leftPadBytes(new byte[]{0x43}, 20);
 
         when(provider.getFeePerKbElection(any())).thenReturn(new ABICallElection(authorizer));
-        when(tx.getSender()).thenReturn(new RskAddress(senderBytes));
+        when(tx.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(senderBytes));
         when(constants.getFeePerKbChangeAuthorizer()).thenReturn(authorizer);
-        when(authorizer.isAuthorized(tx)).thenReturn(false);
+        when(authorizer.isAuthorized(eq(tx), any())).thenReturn(false);
 
         BridgeSupport bridgeSupport = bridgeSupportBuilder
             .withBridgeConstants(constants)
@@ -145,17 +164,12 @@ void voteFeePerKbChange_unsuccessfulVote_negativeFeePerKb() {
         Transaction tx = mock(Transaction.class);
         BridgeConstants constants = mock(BridgeConstants.class);
         AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
-        byte[] senderBytes = ByteUtil.leftPadBytes(new byte[]{0x43}, 20);
 
         when(provider.getFeePerKbElection(any()))
             .thenReturn(new ABICallElection(authorizer));
-        when(tx.getSender())
-            .thenReturn(new RskAddress(senderBytes));
         when(constants.getFeePerKbChangeAuthorizer())
             .thenReturn(authorizer);
-        when(authorizer.isAuthorized(tx))
-            .thenReturn(true);
-        when(authorizer.isAuthorized(tx.getSender()))
+        when(authorizer.isAuthorized(eq(tx), any()))
             .thenReturn(true);
         when(authorizer.getRequiredAuthorizedKeys())
             .thenReturn(2);
@@ -179,15 +193,17 @@ void voteFeePerKbChange_unsuccessfulVote_excessiveFeePerKb() {
         AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
         byte[] senderBytes = ByteUtil.leftPadBytes(new byte[]{0x43}, 20);
 
+        RskAddress sender = new RskAddress(senderBytes);
+
         when(provider.getFeePerKbElection(any()))
             .thenReturn(new ABICallElection(authorizer));
-        when(tx.getSender())
-            .thenReturn(new RskAddress(senderBytes));
+        when(tx.getSender(any(SignatureCache.class)))
+            .thenReturn(sender);
         when(constants.getFeePerKbChangeAuthorizer())
             .thenReturn(authorizer);
-        when(authorizer.isAuthorized(tx))
+        when(authorizer.isAuthorized(eq(tx), any()))
             .thenReturn(true);
-        when(authorizer.isAuthorized(tx.getSender()))
+        when(authorizer.isAuthorized(sender))
             .thenReturn(true);
         when(authorizer.getRequiredAuthorizedKeys())
             .thenReturn(2);
@@ -213,15 +229,17 @@ void voteFeePerKbChange_successfulVote() {
         AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
         byte[] senderBytes = ByteUtil.leftPadBytes(new byte[]{0x43}, 20);
 
+        RskAddress sender = new RskAddress(senderBytes);
+
         when(provider.getFeePerKbElection(any()))
             .thenReturn(new ABICallElection(authorizer));
-        when(tx.getSender())
-            .thenReturn(new RskAddress(senderBytes));
+        when(tx.getSender(any(SignatureCache.class)))
+            .thenReturn(sender);
         when(constants.getFeePerKbChangeAuthorizer())
             .thenReturn(authorizer);
-        when(authorizer.isAuthorized(tx))
+        when(authorizer.isAuthorized(eq(tx), any()))
             .thenReturn(true);
-        when(authorizer.isAuthorized(tx.getSender()))
+        when(authorizer.isAuthorized(sender))
             .thenReturn(true);
         when(authorizer.getRequiredAuthorizedKeys())
             .thenReturn(2);
@@ -246,15 +264,17 @@ void voteFeePerKbChange_successfulVoteWithFeeChange() {
         AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
         byte[] senderBytes = ByteUtil.leftPadBytes(new byte[]{0x43}, 20);
 
+        RskAddress sender = new RskAddress(senderBytes);
+
         when(provider.getFeePerKbElection(any()))
             .thenReturn(new ABICallElection(authorizer));
-        when(tx.getSender())
-            .thenReturn(new RskAddress(senderBytes));
+        when(tx.getSender(any(SignatureCache.class)))
+            .thenReturn(sender);
         when(constants.getFeePerKbChangeAuthorizer())
             .thenReturn(authorizer);
-        when(authorizer.isAuthorized(tx))
+        when(authorizer.isAuthorized(eq(tx), any()))
             .thenReturn(true);
-        when(authorizer.isAuthorized(tx.getSender()))
+        when(authorizer.isAuthorized(sender))
             .thenReturn(true);
         when(authorizer.getRequiredAuthorizedKeys())
             .thenReturn(1);
@@ -328,7 +348,7 @@ void getActivePowpegRedeemScript_after_RSKIP293_activation() {
     @Test
     void increaseLockingCap_unauthorized() {
         AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
-        when(authorizer.isAuthorized(any(Transaction.class))).thenReturn(false);
+        when(authorizer.isAuthorized(any(Transaction.class), any())).thenReturn(false);
 
         BridgeConstants constants = mock(BridgeConstants.class);
         when(constants.getIncreaseLockingCapAuthorizer()).thenReturn(authorizer);
@@ -347,7 +367,7 @@ void increaseLockingCap_below_current_value() {
         when(provider.getLockingCap()).thenReturn(Coin.COIN);
 
         AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
-        when(authorizer.isAuthorized(any(Transaction.class))).thenReturn(true);
+        when(authorizer.isAuthorized(any(Transaction.class), any())).thenReturn(true);
 
         BridgeConstants constants = mock(BridgeConstants.class);
         when(constants.getIncreaseLockingCapAuthorizer()).thenReturn(authorizer);
@@ -367,7 +387,7 @@ void increaseLockingCap_above_upper_value() {
         when(provider.getLockingCap()).thenReturn(Coin.COIN);
 
         AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
-        when(authorizer.isAuthorized(any(Transaction.class))).thenReturn(true);
+        when(authorizer.isAuthorized(any(Transaction.class), any())).thenReturn(true);
 
         BridgeConstants constants = mock(BridgeConstants.class);
         when(constants.getIncreaseLockingCapAuthorizer()).thenReturn(authorizer);
@@ -391,7 +411,7 @@ void increaseLockingCap() {
         when(provider.getLockingCap()).thenReturn(lastValue);
 
         AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
-        when(authorizer.isAuthorized(any(Transaction.class))).thenReturn(true);
+        when(authorizer.isAuthorized(any(Transaction.class), any())).thenReturn(true);
 
         BridgeConstants constants = mock(BridgeConstants.class);
         when(constants.getIncreaseLockingCapAuthorizer()).thenReturn(authorizer);
@@ -2107,7 +2127,8 @@ void when_registerBtcTransaction_sender_not_recognized_before_rskip170_no_lock_a
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+                signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2194,7 +2215,8 @@ void when_registerBtcTransaction_sender_not_recognized_after_rskip170_lock() thr
             peginInstructionsProvider,
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2282,7 +2304,8 @@ void when_registerBtcTransaction_usesLegacyType_beforeFork_lock_and_no_refund()
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2368,7 +2391,8 @@ void when_registerBtcTransaction_usesLegacyType_afterFork_notWhitelisted_no_lock
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2464,7 +2488,8 @@ void when_registerBtcTransaction_usesLegacyType_afterFork_lock_and_no_refund() t
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2545,7 +2570,8 @@ void when_registerBtcTransaction_usesSegCompatibilityType_beforeFork_no_lock_and
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2627,7 +2653,8 @@ void when_registerBtcTransaction_usesSegCompatibilityType_afterFork_lock_and_no_
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2712,7 +2739,8 @@ void when_registerBtcTransaction_usesSegCompatibilityType_afterFork_notWhitelist
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2808,7 +2836,8 @@ void when_registerBtcTransaction_usesMultisigType_beforeFork_no_lock_and_no_refu
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2884,7 +2913,8 @@ void when_registerBtcTransaction_usesMultisigType_afterFork_no_lock_and_refund()
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -2975,7 +3005,8 @@ void when_registerBtcTransaction_usesMultisigWithWitnessType_beforeFork_no_lock_
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -3051,7 +3082,8 @@ void when_registerBtcTransaction_usesMultisigWithWitnessType_afterFork_no_lock_a
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
         byte[] bits = new byte[1];
         bits[0] = 0x3f;
@@ -3265,7 +3297,8 @@ void registerBtcTransaction_accepts_lock_tx_with_witness_after_rskip_143_activat
             new PeginInstructionsProvider(),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         CoinbaseInformation coinbaseInformation = new CoinbaseInformation(witnessMerkleRoot);
@@ -3363,7 +3396,8 @@ void registerBtcTransaction_rejects_tx_with_witness_and_unregistered_coinbase_af
             new PeginInstructionsProvider(),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         bridgeSupport.registerBtcTransaction(mock(Transaction.class), tx1.bitcoinSerialize(), height, pmtWithWitness.bitcoinSerialize());
@@ -3455,7 +3489,8 @@ void registerBtcTransaction_rejects_tx_with_witness_and_unqual_witness_root_afte
             new PeginInstructionsProvider(),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         CoinbaseInformation coinbaseInformation = new CoinbaseInformation(Sha256Hash.ZERO_HASH);
@@ -3543,7 +3578,8 @@ void registerBtcTransaction_rejects_tx_without_witness_unequal_roots_after_rskip
             new PeginInstructionsProvider(),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         bridgeSupport.registerBtcTransaction(mock(Transaction.class), tx1.bitcoinSerialize(), height, pmtWithoutWitness.bitcoinSerialize());
@@ -3629,7 +3665,8 @@ void registerBtcTransaction_accepts_lock_tx_without_witness_after_rskip_143_acti
             new PeginInstructionsProvider(),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         bridgeSupport.registerBtcTransaction(mock(Transaction.class), tx1.bitcoinSerialize(), height, pmtWithoutWitness.bitcoinSerialize());
@@ -3732,7 +3769,8 @@ void registerBtcTransaction_accepts_lock_tx_version1_after_rskip_170_activation(
             peginInstructionsProvider,
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         // Act
@@ -3846,7 +3884,8 @@ void registerBtcTransaction_ignores_pegin_instructions_before_rskip_170_activati
             peginInstructionsProvider,
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         // Act
@@ -3950,7 +3989,8 @@ void when_registerBtcTransaction_invalidPeginProtocolVersion_afterFork_no_lock_a
             peginInstructionsProvider,
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         // Act
@@ -3992,7 +4032,8 @@ void isBlockMerkleRootValid_equal_merkle_roots() {
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         Sha256Hash merkleRoot = PegTestUtils.createHash(1);
@@ -4014,7 +4055,8 @@ void isBlockMerkleRootValid_unequal_merkle_roots_before_rskip_143() {
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         Sha256Hash merkleRoot = PegTestUtils.createHash(1);
@@ -4040,7 +4082,8 @@ void isBlockMerkleRootValid_coinbase_information_null_after_rskip_143() {
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         BtcBlock btcBlock = mock(BtcBlock.class);
@@ -4068,7 +4111,8 @@ void isBlockMerkleRootValid_coinbase_information_not_null_and_unequal_mroots_aft
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         BtcBlock btcBlock = mock(BtcBlock.class);
@@ -4097,7 +4141,8 @@ void isBlockMerkleRootValid_coinbase_information_not_null_and_equal_mroots_after
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         BtcBlock btcBlock = mock(BtcBlock.class);
@@ -4236,7 +4281,8 @@ void getBtcTransactionConfirmations_accepts_tx_with_witness_after_rskip_143() th
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         MerkleBranch merkleBranch = mock(MerkleBranch.class);
@@ -4317,7 +4363,8 @@ void getBtcTransactionConfirmations_unregistered_coinbase_after_rskip_143() thro
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         MerkleBranch merkleBranch = mock(MerkleBranch.class);
@@ -4391,7 +4438,8 @@ void getBtcTransactionConfirmations_registered_coinbase_unequal_witnessroot_afte
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         MerkleBranch merkleBranch = mock(MerkleBranch.class);
@@ -4452,7 +4500,8 @@ void getBtcTransactionConfirmations_tx_without_witness_unequal_roots_after_rskip
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         MerkleBranch merkleBranch = mock(MerkleBranch.class);
@@ -4522,7 +4571,8 @@ void getBtcTransactionConfirmations_accepts_tx_without_witness_after_rskip_143()
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         MerkleBranch merkleBranch = mock(MerkleBranch.class);
@@ -4564,7 +4614,8 @@ void when_RegisterBtcCoinbaseTransaction_wrong_witnessReservedValue_noSent() thr
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         byte[] bits = new byte[1];
@@ -4618,7 +4669,8 @@ void when_RegisterBtcCoinbaseTransaction_MerkleTreeWrongFormat_noSent() throws B
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         //Leaving no confirmation blocks
@@ -4668,7 +4720,8 @@ void when_RegisterBtcCoinbaseTransaction_HashNotInPmt_noSent() throws BlockStore
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         byte[] bits = new byte[1];
@@ -4722,7 +4775,8 @@ void when_RegisterBtcCoinbaseTransaction_notVerify_noSent() throws BlockStoreExc
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         byte[] bits = new byte[1];
@@ -4796,7 +4850,8 @@ void when_RegisterBtcCoinbaseTransaction_not_equal_merkle_root_noSent() throws B
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         byte[] bits = new byte[1];
@@ -4870,7 +4925,8 @@ void when_RegisterBtcCoinbaseTransaction_null_stored_block_noSent() throws Block
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         byte[] bits = new byte[1];
@@ -4952,7 +5008,8 @@ void registerBtcCoinbaseTransaction() throws BlockStoreException, AddressFormatE
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         byte[] bits = new byte[1];
@@ -5012,7 +5069,8 @@ void hasBtcCoinbaseTransaction_before_rskip_143_activation() throws AddressForma
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         CoinbaseInformation coinbaseInformation = new CoinbaseInformation(Sha256Hash.ZERO_HASH);
@@ -5036,7 +5094,8 @@ void hasBtcCoinbaseTransaction_after_rskip_143_activation() throws AddressFormat
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         CoinbaseInformation coinbaseInformation = new CoinbaseInformation(Sha256Hash.ZERO_HASH);
@@ -5060,7 +5119,8 @@ void hasBtcCoinbaseTransaction_fails_with_null_coinbase_information_after_rskip_
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         Assertions.assertFalse(bridgeSupport.hasBtcBlockCoinbaseTransactionInformation(Sha256Hash.ZERO_HASH));
@@ -5367,7 +5427,8 @@ void validationsForRegisterBtcTransaction_invalid_block_merkle_root() throws IOE
             mock(Context.class),
             mock(FederationSupport.class),
             btcBlockStoreFactory,
-            mock(ActivationConfig.ForBlock.class)
+            mock(ActivationConfig.ForBlock.class),
+            signatureCache
         );
 
         Assertions.assertFalse(bridgeSupport.validationsForRegisterBtcTransaction(tx.getHash(), height, pmt.bitcoinSerialize(), tx.bitcoinSerialize()));
@@ -5418,7 +5479,8 @@ void validationsForRegisterBtcTransaction_successful() throws IOException, Block
             mock(Context.class),
             mock(FederationSupport.class),
             btcBlockStoreFactory,
-            mock(ActivationConfig.ForBlock.class)
+            mock(ActivationConfig.ForBlock.class),
+            signatureCache
         );
 
         Assertions.assertTrue(bridgeSupport.validationsForRegisterBtcTransaction(tx.getHash(), height, pmt.bitcoinSerialize(), tx.bitcoinSerialize()));
@@ -5512,7 +5574,8 @@ void getTransactionType_migration_tx() {
             new Context(bridgeConstantsRegtest.getBtcParams()),
             mockFederationSupport,
             null,
-            mock(ActivationConfig.ForBlock.class)
+            mock(ActivationConfig.ForBlock.class),
+            signatureCache
         );
 
         Federation retiringFederation = bridgeConstantsRegtest.getGenesisFederation();
@@ -5976,7 +6039,8 @@ void processPegIn_errorParsingPeginInstructions_beforeRskip170_dontRefundSender(
             mock(PeginInstructionsProvider.class),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         // Act
@@ -6031,7 +6095,8 @@ void processPegIn_errorParsingPeginInstructions_afterRskip170_refundSender()
             peginInstructionsProvider,
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         // Act
@@ -6365,7 +6430,8 @@ private void assertRefundInProcessPegInVersionLegacy(
             new PeginInstructionsProvider(),
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         // Act
@@ -6732,7 +6798,8 @@ private void assertRefundInProcessPegInVersion1(
             peginInstructionsProvider,
             mock(Block.class),
             mock(BtcBlockStoreWithCache.Factory.class),
-            activations
+            activations,
+            signatureCache
         );
 
         // Act
@@ -6905,7 +6972,8 @@ private void assertLockingCap(
             new PeginInstructionsProvider(),
             executionBlock,
             mockFactory,
-            activations
+            activations,
+            signatureCache
         );
 
         // Simulate blockchain
@@ -6983,7 +7051,7 @@ private BridgeSupport getBridgeSupport(BridgeConstants constants, BridgeStorageP
     private BridgeSupport getBridgeSupport(BridgeConstants constants, BridgeStorageProvider provider, Repository track,
         BtcLockSenderProvider btcLockSenderProvider, PeginInstructionsProvider peginInstructionsProvider,
         Block executionBlock, BtcBlockStoreWithCache.Factory blockStoreFactory,
-        ActivationConfig.ForBlock activations) {
+        ActivationConfig.ForBlock activations, SignatureCache signatureCache) {
 
         if (btcLockSenderProvider == null) {
             btcLockSenderProvider = mock(BtcLockSenderProvider.class);
@@ -7005,7 +7073,8 @@ private BridgeSupport getBridgeSupport(BridgeConstants constants, BridgeStorageP
             new Context(constants.getBtcParams()),
             new FederationSupport(constants, provider, executionBlock),
             blockStoreFactory,
-            activations
+            activations,
+            signatureCache
         );
     }
 
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTestIntegration.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTestIntegration.java
index eea4dd31686..93d798d801b 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTestIntegration.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTestIntegration.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg;
 
 import co.rsk.bitcoinj.core.*;
@@ -52,10 +51,7 @@
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
-import org.ethereum.core.Block;
-import org.ethereum.core.Genesis;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.db.MutableRepository;
@@ -116,11 +112,14 @@ public class BridgeSupportTestIntegration {
     private NetworkParameters btcParams;
     private ActivationConfig.ForBlock activationsBeforeForks;
 
+    private SignatureCache signatureCache;
+
     @BeforeEach
     void setUpOnEachTest() {
         bridgeConstants = BridgeRegTestConstants.getInstance();
         btcParams = bridgeConstants.getBtcParams();
         activationsBeforeForks = ActivationConfigsForTest.genesis().forBlock(0);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
     }
 
     @Test
@@ -230,7 +229,8 @@ void testGetBtcBlockchainBlockLocatorWithBtcCheckpoints() throws Exception {
             new Context(bridgeConstants.getBtcParams()),
             new FederationSupport(bridgeConstants, provider, null),
             btcBlockStoreFactory,
-            mock(ActivationConfig.ForBlock.class)
+            mock(ActivationConfig.ForBlock.class),
+            signatureCache
         ) {
             @Override
             InputStream getCheckPoints() {
@@ -994,7 +994,8 @@ void releaseBtcFromContract() throws AddressFormatException, IOException {
                 Hex.decode(TO_ADDRESS),
                 BigIntegers.asUnsignedByteArray(AMOUNT),
                 Hex.decode(DATA),
-                ""
+                "",
+                new BlockTxSignatureCache(new ReceivedTxSignatureCache())
         );
 
         track.saveCode(tx.getSender(), new byte[]{0x1});
@@ -1540,7 +1541,8 @@ void registerBtcTransactionWithCrossFederationsChange() throws Exception {
                     btcContext,
                     mockFederationSupport,
                     mockFactory,
-                    activations
+                    activations,
+                    signatureCache
             );
 
             bridgeSupport.registerBtcTransaction(mock(Transaction.class), releaseWithChangeTx.bitcoinSerialize(), 1, partialMerkleTree.bitcoinSerialize());
@@ -2012,7 +2014,7 @@ void voteFederationChange_notAuthorized() throws IOException, BridgeIllegalArgum
         );
         ABICallSpec spec = new ABICallSpec("create", new byte[][]{});
         Transaction mockedTx = mock(Transaction.class);
-        when(mockedTx.getSender()).thenReturn(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(12L)).getAddress()));
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(12L)).getAddress()));
         Assertions.assertEquals(BridgeSupport.FEDERATION_CHANGE_GENERIC_ERROR_CODE, bridgeSupport.voteFederationChange(mockedTx, spec));
     }
 
@@ -2031,7 +2033,7 @@ public VotingMocksProvider(String function, byte[][] arguments, boolean mockVote
             voter = new RskAddress(voterBytes);
 
             tx = mock(Transaction.class);
-            when(tx.getSender()).thenReturn(voter);
+            when(tx.getSender(any(SignatureCache.class))).thenReturn(voter);
 
             spec = new ABICallSpec(function, arguments);
 
@@ -2982,7 +2984,7 @@ void addLockWhitelistAddress_ok() {
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForWhitelistTests(mockedWhitelist);
 
@@ -3003,7 +3005,7 @@ void addLockWhitelistAddress_addFails() {
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForWhitelistTests(mockedWhitelist);
 
@@ -3020,7 +3022,7 @@ void addLockWhitelistAddress_notAuthorized() {
         Transaction mockedTx = mock(Transaction.class);
         byte[] senderBytes = Hex.decode("0000000000000000000000000000000000aabbcc");
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForWhitelistTests(mockedWhitelist);
 
@@ -3050,7 +3052,7 @@ void setLockWhitelistDisableBlockDelay_ok() throws IOException, BlockStoreExcept
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         when(mockedWhitelist.isDisableBlockSet()).thenReturn(false);
         int bestChainHeight = 10;
@@ -3077,7 +3079,7 @@ void setLockWhitelistDisableBlockDelay_negativeDisableBlockBI() throws IOExcepti
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         when(mockedWhitelist.isDisableBlockSet()).thenReturn(false);
         int bestChainHeight = 10;
@@ -3104,7 +3106,7 @@ void setLockWhitelistDisableBlockDelay_disableBlockDelayBIBiggerThanInt() throws
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         when(mockedWhitelist.isDisableBlockSet()).thenReturn(false);
         BtcBlockStoreWithCache btcBlockStore = mock(BtcBlockStoreWithCache.class);
@@ -3125,7 +3127,7 @@ void setLockWhitelistDisableBlockDelay_overflow() throws IOException, BlockStore
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         when(mockedWhitelist.isDisableBlockSet()).thenReturn(false);
         int bestChainHeight = (Integer.MAX_VALUE / 2) + 2;
@@ -3152,7 +3154,7 @@ void setLockWhitelistDisableBlockDelay_maxIntValueDisableBlockBI() throws IOExce
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         when(mockedWhitelist.isDisableBlockSet()).thenReturn(false);
         int bestChainHeight = 10;
@@ -3179,7 +3181,7 @@ void setLockWhitelistDisableBlockDelay_disabled() throws IOException, BlockStore
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         when(mockedWhitelist.isDisableBlockSet()).thenReturn(true);
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForWhitelistTests(mockedWhitelist);
@@ -3194,7 +3196,7 @@ void setLockWhitelistDisableBlockDelay_notAuthorized() throws IOException, Block
         Transaction mockedTx = mock(Transaction.class);
         byte[] senderBytes = Hex.decode("0000000000000000000000000000000000aabbcc");
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForWhitelistTests(mockedWhitelist);
 
@@ -3211,7 +3213,7 @@ void removeLockWhitelistAddress_ok() {
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForWhitelistTests(mockedWhitelist);
 
@@ -3232,7 +3234,7 @@ void removeLockWhitelistAddress_removeFails() {
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForWhitelistTests(mockedWhitelist);
 
@@ -3250,7 +3252,7 @@ void removeLockWhitelistAddress_notAuthorized() {
         Transaction mockedTx = mock(Transaction.class);
         byte[] senderBytes = Hex.decode("0000000000000000000000000000000000aabbcc");
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForWhitelistTests(mockedWhitelist);
 
@@ -3266,7 +3268,7 @@ void removeLockWhitelistAddress_invalidAddress() {
                 "04641fb250d7ca7a1cb4f530588e978013038ec4294d084d248869dd54d98873e45c61d00ceeaeeb9e35eab19fa5fbd8f07cb8a5f0ddba26b4d4b18349c09199ad"
         )).getAddress();
         RskAddress sender = new RskAddress(senderBytes);
-        when(mockedTx.getSender()).thenReturn(sender);
+        when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(sender);
         LockWhitelist mockedWhitelist = mock(LockWhitelist.class);
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForWhitelistTests(mockedWhitelist);
 
@@ -3968,7 +3970,8 @@ private BridgeSupport getBridgeSupport(
                 new Context(constants.getBtcParams()),
                 new FederationSupport(constants, provider, executionBlock),
                 blockStoreFactory,
-                activations
+                activations,
+                signatureCache
         );
     }
 
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeTest.java
index df9787f0e4f..e073d92caee 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeTest.java
@@ -12,9 +12,7 @@
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
-import org.ethereum.core.Block;
-import org.ethereum.core.CallTransaction;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.PrecompiledContracts;
@@ -43,6 +41,7 @@ class BridgeTest {
     private TestSystemProperties config = new TestSystemProperties();
     private Constants constants;
     private ActivationConfig activationConfig;
+    private SignatureCache signatureCache;
 
     @BeforeEach
     void resetConfigToRegTest() {
@@ -51,6 +50,7 @@ void resetConfigToRegTest() {
         when(config.getNetworkConstants()).thenReturn(constants);
         activationConfig = spy(ActivationConfigsForTest.genesis());
         when(config.getActivationConfig()).thenReturn(activationConfig);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
     }
 
     @Test
@@ -249,9 +249,9 @@ void registerBtcTransaction_beforeRskip199_rejectsExternalCalls()
         when(bridgeSupportMock.getActiveFederation()).thenReturn(activeFederation);
 
         Transaction rskTx = mock(Transaction.class);
-        when(rskTx.getSender()).thenReturn(new RskAddress("0000000000000000000000000000000000000001"));
+        when(rskTx.getSender(any(SignatureCache.class))).thenReturn(new RskAddress("0000000000000000000000000000000000000001"));
 
-        Bridge bridge = getBridgeInstance(rskTx, bridgeSupportMock, activations);
+        Bridge bridge = getBridgeInstance(rskTx, bridgeSupportMock, activations, signatureCache);
 
         byte[] value = Sha256Hash.ZERO_HASH.getBytes();
         int zero = 0;
@@ -295,9 +295,9 @@ void registerBtcTransaction_beforeRskip199_acceptsCallFromFederationMember()
         when(bridgeSupportMock.getActiveFederation()).thenReturn(activeFederation);
 
         Transaction rskTx = mock(Transaction.class);
-        when(rskTx.getSender()).thenReturn(fed1Address);
+        when(rskTx.getSender(any(SignatureCache.class))).thenReturn(fed1Address);
 
-        Bridge bridge = getBridgeInstance(rskTx, bridgeSupportMock, activations);
+        Bridge bridge = getBridgeInstance(rskTx, bridgeSupportMock, activations, signatureCache);
 
         byte[] value = Sha256Hash.ZERO_HASH.getBytes();
         int zero = 0;
@@ -691,9 +691,9 @@ void receiveHeaders_after_RSKIP200_notFederation() {
         when(bridgeSupportMock.getActiveFederation()).thenReturn(BridgeRegTestConstants.getInstance().getGenesisFederation());
 
         Transaction txMock = mock(Transaction.class);
-        when(txMock.getSender()).thenReturn(new RskAddress(new ECKey().getAddress()));  //acces for anyone
+        when(txMock.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(new ECKey().getAddress()));  //acces for anyone
 
-        Bridge bridge = getBridgeInstance(txMock, bridgeSupportMock, activations);
+        Bridge bridge = getBridgeInstance(txMock, bridgeSupportMock, activations, signatureCache);
 
         try {
             bridge.execute(Bridge.RECEIVE_HEADERS.encode());
@@ -949,12 +949,12 @@ private Bridge getBridgeInstance(Federation activeFederation, Federation retirin
 
         ECKey key = ECKey.fromPrivate(BigInteger.valueOf(senderPK));
         Transaction rskTxMock = mock(Transaction.class);
-        doReturn(new RskAddress(key.getAddress())).when(rskTxMock).getSender();
+        doReturn(new RskAddress(key.getAddress())).when(rskTxMock).getSender(any(SignatureCache.class));
 
         ActivationConfig activations = spy(ActivationConfigsForTest.genesis());
         doReturn(true).when(activations).isActive(eq(RSKIP143), anyLong());
 
-        return getBridgeInstance(rskTxMock, bridgeSupportMock, activations);
+        return getBridgeInstance(rskTxMock, bridgeSupportMock, activations, signatureCache);
     }
 
     private Bridge getBridgeInstance(Federation activeFederation, Federation retiringFederation, int senderPK, BridgeSupport bridgeSupportMock) {
@@ -963,12 +963,12 @@ private Bridge getBridgeInstance(Federation activeFederation, Federation retirin
 
         ECKey key = ECKey.fromPrivate(BigInteger.valueOf(senderPK));
         Transaction rskTxMock = mock(Transaction.class);
-        doReturn(new RskAddress(key.getAddress())).when(rskTxMock).getSender();
+        doReturn(new RskAddress(key.getAddress())).when(rskTxMock).getSender(any(SignatureCache.class));
 
         ActivationConfig activations = spy(ActivationConfigsForTest.genesis());
         doReturn(true).when(activations).isActive(eq(RSKIP143), anyLong());
 
-        return getBridgeInstance(rskTxMock, bridgeSupportMock, activations);
+        return getBridgeInstance(rskTxMock, bridgeSupportMock, activations, signatureCache);
     }
 
     /**
@@ -979,17 +979,17 @@ private Bridge getBridgeInstance(Federation activeFederation, Federation retirin
      * @param activationConfig      Provide the activationConfig to be used
      * @return Bridge instance
      */
-    private Bridge getBridgeInstance(Transaction txMock, BridgeSupport bridgeSupportInstance, ActivationConfig activationConfig) {
+    private Bridge getBridgeInstance(Transaction txMock, BridgeSupport bridgeSupportInstance, ActivationConfig activationConfig, SignatureCache signatureCache) {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupportInstance);
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactoryMock);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactoryMock, signatureCache);
         bridge.init(txMock, getGenesisBlock(), null, null, null, null);
         return bridge;
     }
 
     private Bridge getBridgeInstance(BridgeSupport bridgeSupportInstance, ActivationConfig activationConfig) {
-        return getBridgeInstance(mock(Transaction.class), bridgeSupportInstance, activationConfig);
+        return getBridgeInstance(mock(Transaction.class), bridgeSupportInstance, activationConfig, signatureCache);
     }
 
     @Deprecated
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeTestIntegration.java b/rskj-core/src/test/java/co/rsk/peg/BridgeTestIntegration.java
index 2f79559cbba..e8ae0a004f3 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeTestIntegration.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeTestIntegration.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg;
 
 import static co.rsk.bitcoinj.core.Utils.uint32ToByteStreamLE;
@@ -58,12 +57,7 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.CallTransaction;
-import org.ethereum.core.Genesis;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.datasource.HashMapDB;
@@ -151,6 +145,7 @@ public class BridgeTestIntegration {
     private ActivationConfig activationConfig;
     private ActivationConfig.ForBlock activationConfigAll;
     private BlockFactory blockFactory;
+    private SignatureCache signatureCache;
 
     @BeforeAll
      static void setUpBeforeClass() {
@@ -169,6 +164,7 @@ void resetConfigToRegTest() {
         when(config.getActivationConfig()).thenReturn(activationConfig);
         blockFactory = new BlockFactory(activationConfig);
         activationConfigAll = ActivationConfigsForTest.all().forBlock(0);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
     }
 
     @Test
@@ -202,9 +198,10 @@ void callUpdateCollectionsWithSignatureNotFromFederation() throws IOException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         BlockChainBuilder blockChainBuilder = new BlockChainBuilder().setRequireUnclesValidation(false);
         World world = new World(blockChainBuilder);
         bridge.init(rskTx, world.getBlockChain().getBestBlock(), track, world.getBlockStore(), null, new LinkedList<>());
@@ -251,10 +248,11 @@ void callUpdateCollectionsWithTransactionsWaitingForConfirmation() throws IOExce
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
 
         BlockChainBuilder blockChainBuilder = new BlockChainBuilder().setRequireUnclesValidation(false);
         World world = new World(blockChainBuilder);
@@ -313,9 +311,10 @@ void callUpdateCollectionsWithTransactionsWaitingForConfirmationWithEnoughConfir
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, blocks.get(9), track, world.getBlockStore(), null, new LinkedList<>());
 
         bridge.execute(Bridge.UPDATE_COLLECTIONS.encode());
@@ -337,9 +336,10 @@ void sendNoRskTx() throws IOException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), track, null, null, null);
         try {
             bridge.execute(Bridge.RECEIVE_HEADERS.encode());
@@ -373,7 +373,7 @@ void sendNoBlockHeader() throws BlockStoreException, IOException, VMException {
         when(bridgeSupportFactory.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupport);
         when(bridgeSupport.getActiveFederation()).thenReturn(bridgeConstants.getGenesisFederation());
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         bridge.execute(Bridge.RECEIVE_HEADERS.encode());
@@ -405,9 +405,9 @@ void sendOrphanBlockHeader() throws VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig, signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         Integer previousHeight = bridge.getBtcBlockchainBestChainHeight(new Object[]{});
@@ -436,9 +436,9 @@ void executeWithFunctionSignatureLengthTooShortBeforeRskip88() throws VMExceptio
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig, signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         Transaction mockedTx = mock(Transaction.class);
         bridge.init(mockedTx, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         Assertions.assertNull(bridge.execute(new byte[3]));
@@ -451,13 +451,15 @@ void executeWithFunctionSignatureLengthTooShortAfterRskip88() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig
+                activationConfig,
+                signatureCache
         );
         Bridge bridge = new Bridge(
                 PrecompiledContracts.BRIDGE_ADDR,
                 constants,
                 activationConfig,
-                bridgeSupportFactory
+                bridgeSupportFactory,
+                signatureCache
         );
         Transaction mockedTx = mock(Transaction.class);
 
@@ -475,9 +477,10 @@ void executeWithInexistentFunctionBeforeRskip88() throws VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         Transaction mockedTx = mock(Transaction.class);
         bridge.init(mockedTx, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         Assertions.assertNull(bridge.execute(new byte[4]));
@@ -490,9 +493,10 @@ void executeWithInexistentFunctionAfterRskip88() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         Transaction mockedTx = mock(Transaction.class);
 
         try {
@@ -521,9 +525,10 @@ void receiveHeadersNotFromTheFederation() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         try {
             bridge.execute(Bridge.RECEIVE_HEADERS.encode());
@@ -555,9 +560,10 @@ void receiveHeadersWithNonParseableHeader() throws VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         Object[] objectArray = new Object[1];
@@ -588,7 +594,7 @@ void receiveHeadersWithCorrectSizeHeaders() throws Exception {
 
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
         Bridge bridge = spy(new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock));
+                bridgeSupportFactoryMock, signatureCache));
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupportMock);
@@ -610,7 +616,7 @@ void receiveHeadersWithCorrectSizeHeaders() throws Exception {
         }
 
         try (MockedStatic<BridgeUtils> bridgeUtilsMocked = mockStatic(BridgeUtils.class)) {
-            bridgeUtilsMocked.when(() -> BridgeUtils.isFromFederateMember(any(), any())).thenReturn(true);
+            bridgeUtilsMocked.when(() -> BridgeUtils.isFromFederateMember(any(), any(), any())).thenReturn(true);
 
             MessageSerializer serializer = bridgeConstants.getBtcParams().getDefaultSerializer();
             MessageSerializer spySerializer = Mockito.spy(serializer);
@@ -659,7 +665,7 @@ void receiveHeadersWithIncorrectSizeHeaders() throws Exception {
         when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupportMock);
 
         Bridge spiedBridge = spy(new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock));
+                bridgeSupportFactoryMock, signatureCache));
         spiedBridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         final int numBlocks = 10;
@@ -704,7 +710,7 @@ void receiveHeadersWithIncorrectSizeHeaders() throws Exception {
         }
 
         try (MockedStatic<BridgeUtils> bridgeUtilsMocked = mockStatic(BridgeUtils.class)) {
-            bridgeUtilsMocked.when(() -> BridgeUtils.isFromFederateMember(any(), any())).thenReturn(true);
+            bridgeUtilsMocked.when(() -> BridgeUtils.isFromFederateMember(any(), any(), any())).thenReturn(true);
 
             NetworkParameters btcParamsMock = mock(NetworkParameters.class);
             BridgeConstants bridgeConstantsMock = mock(BridgeConstants.class);
@@ -740,9 +746,9 @@ void registerBtcTransactionNotFromFederation() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig, signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
 
@@ -776,9 +782,9 @@ void receiveHeadersWithHugeDeclaredTransactionsSize() throws VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig, signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         NetworkParameters btcParams = RegTestParams.get();
@@ -835,9 +841,9 @@ void registerBtcTransactionWithNonParseableTx() throws VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig, signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
 
@@ -894,9 +900,10 @@ void registerBtcTransactionWithNonParseableMerkleeProof1() throws Exception {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         NetworkParameters btcParams = RegTestParams.get();
@@ -929,9 +936,10 @@ void registerBtcTransactionWithNonParseableMerkleeProof2() throws VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         NetworkParameters btcParams = RegTestParams.get();
@@ -964,9 +972,10 @@ void registerBtcTransactionWithHugeDeclaredSizeMerkleeProof() throws VMException
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         NetworkParameters btcParams = RegTestParams.get();
@@ -1011,9 +1020,10 @@ void getFederationAddress() throws Exception {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         Transaction mockedTx = mock(Transaction.class);
         bridge.init(mockedTx, getGenesisBlock(), track, null, null, null);
 
@@ -1030,9 +1040,10 @@ void getMinimumLockTxValue() throws Exception {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         Transaction mockedTx = mock(Transaction.class);
         bridge.init(mockedTx, getGenesisBlock(), track, null, null, null);
 
@@ -1061,9 +1072,10 @@ void addSignatureNotFromFederation() throws Exception {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         byte[] federatorPublicKeySerialized = new byte[3];
@@ -1099,9 +1111,10 @@ void addSignatureWithNonParseablePublicKey() throws Exception {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         byte[] federatorPublicKeySerialized = new byte[3];
@@ -1132,9 +1145,10 @@ void addSignatureWithEmptySignatureArray() throws Exception {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         byte[] federatorPublicKeySerialized = new BtcECKey().getPubKey();
@@ -1165,9 +1179,10 @@ void addSignatureWithNonParseableSignature() throws Exception {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, new BlockGenerator().getGenesisBlock(), track, null, null, null);
 
         byte[] federatorPublicKeySerialized = new BtcECKey().getPubKey();
@@ -1198,9 +1213,10 @@ void addSignatureWithNonParseableRskTx() throws Exception {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, new BlockGenerator().getGenesisBlock(), track, null, null, null);
 
         byte[] federatorPublicKeySerialized = new BtcECKey().getPubKey();
@@ -1213,7 +1229,7 @@ void addSignatureWithNonParseableRskTx() throws Exception {
 
     @Test
     void exceptionInUpdateCollection() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
 
         try {
             bridge.updateCollections(null);
@@ -1225,7 +1241,7 @@ void exceptionInUpdateCollection() {
 
     @Test
     void exceptionInReleaseBtc() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
 
         try {
             bridge.releaseBtc(null);
@@ -1237,7 +1253,7 @@ void exceptionInReleaseBtc() {
 
     @Test
     void exceptionInGetStateForBtcReleaseClient() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
 
         try {
             bridge.getStateForBtcReleaseClient(null);
@@ -1249,7 +1265,7 @@ void exceptionInGetStateForBtcReleaseClient() {
 
     @Test
     void exceptionInGetStateForDebugging() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
 
         try {
             bridge.getStateForDebugging(null);
@@ -1261,7 +1277,7 @@ void exceptionInGetStateForDebugging() {
 
     @Test
     void exceptionInGetBtcBlockchainBestChainHeight() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
 
         try {
             bridge.getBtcBlockchainBestChainHeight(null);
@@ -1273,7 +1289,7 @@ void exceptionInGetBtcBlockchainBestChainHeight() {
 
     @Test
     void exceptionInGetBtcBlockchainBlockLocator() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
 
         try {
             bridge.getBtcBlockchainBlockLocator(null);
@@ -1294,7 +1310,7 @@ void getBtcBlockchainBlockLocatorBeforeRskip89Fork() throws Exception {
 
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
         Bridge bridge = spy(new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock));
+                bridgeSupportFactoryMock, signatureCache));
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         when(bridgeSupportMock.getBtcBlockchainBlockLocator())
@@ -1321,9 +1337,10 @@ void getBtcBlockchainBlockLocatorAfterRskip88And89Fork() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
 
         bridge.init(mock(Transaction.class), getGenesisBlock(), track, null, null, null);
 
@@ -1343,9 +1360,10 @@ void getGasForDataFreeTx() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
 
         org.ethereum.core.Transaction rskTx = CallTransaction.createCallTransaction(
                 0,
@@ -1430,9 +1448,10 @@ void isBtcTxHashAlreadyProcessed_normalFlow() throws IOException, VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1457,9 +1476,10 @@ void isBtcTxHashAlreadyProcessed_exception() throws IOException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1477,9 +1497,10 @@ void getBtcTxHashProcessedHeight_normalFlow() throws IOException, VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1503,9 +1524,10 @@ void getBtcTxHashProcessedHeight_exception() throws IOException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1523,9 +1545,10 @@ void getFederationSize() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1539,10 +1562,11 @@ void getFederationThreshold() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1556,9 +1580,10 @@ void getFederationCreationTime() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1569,7 +1594,7 @@ void getFederationCreationTime() {
 
     @Test
     void getFederationCreationBlockNumber() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
         when(bridgeSupportMock.getFederationCreationBlockNumber()).thenReturn(42L);
@@ -1582,7 +1607,7 @@ void getFederatorPublicKey_beforeMultikey() throws VMException {
         doReturn(false).when(activationConfig).isActive(eq(RSKIP123), anyLong());
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -1616,7 +1641,7 @@ void getFederatorPublicKey_afterMultikey() throws VMException {
         doReturn(true).when(activationConfig).isActive(eq(RSKIP123), anyLong());
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
 
@@ -1631,7 +1656,7 @@ void getFederatorPublicKeyOfType_beforeMultikey() throws VMException {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -1647,7 +1672,7 @@ void getFederatorPublicKeyOfType_afterMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -1682,9 +1707,10 @@ void getRetiringFederationSize() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1698,10 +1724,11 @@ void getRetiringFederationThreshold() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1715,9 +1742,10 @@ void getRetiringFederationCreationTime() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1728,7 +1756,7 @@ void getRetiringFederationCreationTime() {
 
     @Test
     void getRetiringFederationCreationBlockNumber() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
         when(bridgeSupportMock.getRetiringFederationCreationBlockNumber()).thenReturn(42L);
@@ -1742,7 +1770,7 @@ void getRetiringFederatorPublicKey_beforeMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -1777,7 +1805,7 @@ void getRetiringFederatorPublicKey_afterMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -1792,7 +1820,7 @@ void getRetiringFederatorPublicKeyOfType_beforeMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -1807,7 +1835,7 @@ void getRetiringFederatorPublicKeyOfType_afterMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
 
@@ -1843,10 +1871,11 @@ void getPendingFederationSize() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1861,7 +1890,7 @@ void getPendingFederatorPublicKey_beforeMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
 
@@ -1896,7 +1925,7 @@ void getPendingFederatorPublicKey_afterMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -1911,7 +1940,7 @@ void getPendingFederatorPublicKeyOfType_beforeMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -1926,7 +1955,7 @@ void getPendingFederatorPublicKeyOfType_afterMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(mock(Transaction.class), getGenesisBlock(), createRepository().startTracking(), null, null, null);
 
@@ -1963,10 +1992,11 @@ void createFederation() throws BridgeIllegalArgumentException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -1984,7 +2014,7 @@ void addFederatorPublicKey_beforeMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
 
@@ -2009,7 +2039,7 @@ void addFederatorPublicKey_afterMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
 
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
@@ -2030,7 +2060,7 @@ void addFederatorPublicKeyMultikey_beforeMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
 
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
@@ -2054,7 +2084,7 @@ void addFederatorPublicKeyMultikey_afterMultikey() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
 
@@ -2080,9 +2110,10 @@ void commitFederation_ok() throws BridgeIllegalArgumentException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2097,9 +2128,10 @@ void commitFederation_wrongParameterType() throws BridgeIllegalArgumentException
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2114,10 +2146,11 @@ void rollbackFederation() throws BridgeIllegalArgumentException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2131,9 +2164,10 @@ void getLockWhitelistSize() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2147,10 +2181,11 @@ void getLockWhitelistAddress() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         OneOffWhiteListEntry mockedEntry10 = new OneOffWhiteListEntry(new BtcECKey().toAddress(networkParameters), Coin.COIN);
@@ -2177,10 +2212,11 @@ void getLockWhitelistEntryByAddressBeforeRskip87And88Fork() throws VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(mockedTransaction, getGenesisBlock(), track, null, null, null);
 
         Assertions.assertNull(bridge.execute(Bridge.GET_LOCK_WHITELIST_ENTRY_BY_ADDRESS.encode(new Object[]{address.toBase58()})));
@@ -2211,7 +2247,7 @@ void getLockWhitelistEntryByAddressAfterRskip87Fork() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
         when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupportMock);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
         bridge.init(mockedTransaction, getGenesisBlock(), track, null, null, null);
 
         // Get the unlimited whitelist address
@@ -2244,14 +2280,15 @@ void addLockWhitelistAddressBeforeRskip87Fork() throws VMException {
         Transaction mockedTransaction = mock(Transaction.class);
         // Just setting a random address as the sender
         RskAddress sender = new RskAddress(fedECPrivateKey.getAddress());
-        when(mockedTransaction.getSender()).thenReturn(sender);
+        when(mockedTransaction.getSender(any(SignatureCache.class))).thenReturn(sender);
 
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(mockedTransaction, getGenesisBlock(), track, null, null, null);
 
         byte[] result = bridge.execute(Bridge.ADD_LOCK_WHITELIST_ADDRESS.encode(new Object[]{
@@ -2276,9 +2313,10 @@ void addLockWhitelistAddressAfterRskip87And88Fork() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(mockedTransaction, getGenesisBlock(), track, null, null, null);
 
         try {
@@ -2303,10 +2341,11 @@ void addOneOffLockWhitelistAddressBeforeRskip87And88Fork() throws VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(mockedTransaction, getGenesisBlock(), track, null, null, null);
 
         Assertions.assertNull(bridge.execute(Bridge.ADD_ONE_OFF_LOCK_WHITELIST_ADDRESS.encode(new Object[]{"i-am-an-address", BigInteger.valueOf(25L)})));
@@ -2323,14 +2362,15 @@ void addOneOffLockWhitelistAddressAfterRskip87Fork() throws VMException {
         Transaction mockedTransaction = mock(Transaction.class);
         // Just setting a random address as the sender
         RskAddress sender = new RskAddress(fedECPrivateKey.getAddress());
-        when(mockedTransaction.getSender()).thenReturn(sender);
+        when(mockedTransaction.getSender(any(SignatureCache.class))).thenReturn(sender);
 
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(mockedTransaction, getGenesisBlock(), track, null, null, null);
 
         byte[] result = bridge.execute(Bridge.ADD_ONE_OFF_LOCK_WHITELIST_ADDRESS.encode(new Object[]{
@@ -2355,9 +2395,10 @@ void addUnlimitedLockWhitelistAddressBeforeRskip87And88Fork() throws VMException
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(mockedTransaction, getGenesisBlock(), track, null, null, null);
 
         Assertions.assertNull(bridge.execute(Bridge.ADD_UNLIMITED_LOCK_WHITELIST_ADDRESS.encode(new Object[]{"i-am-an-address"})));
@@ -2374,14 +2415,15 @@ void addUnlimitedLockWhitelistAddressAfterRskip87Fork() throws VMException {
         Transaction mockedTransaction = mock(Transaction.class);
         // Just setting a random address as the sender
         RskAddress sender = new RskAddress(fedECPrivateKey.getAddress());
-        when(mockedTransaction.getSender()).thenReturn(sender);
+        when(mockedTransaction.getSender(any(SignatureCache.class))).thenReturn(sender);
 
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(mockedTransaction, getGenesisBlock(), track, null, null, null);
 
         byte[] result = bridge.execute(Bridge.ADD_UNLIMITED_LOCK_WHITELIST_ADDRESS.encode(new Object[]{
@@ -2402,9 +2444,10 @@ void removeLockWhitelistAddress() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(mockedTransaction, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2415,7 +2458,7 @@ void removeLockWhitelistAddress() {
 
     @Test
     void getFeePerKb() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
         when(bridgeSupportMock.getFeePerKb())
@@ -2430,10 +2473,11 @@ void voteFeePerKb_ok() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2448,10 +2492,11 @@ void voteFeePerKb_wrongParameterType() throws BridgeIllegalArgumentException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2495,9 +2540,10 @@ void testBlock457BridgeCall() throws Exception {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
 
         Genesis genesisBlock = new BlockGenerator().getGenesisBlock();
         ActivationConfig.ForBlock spiedActivations = spy(activationConfig.forBlock(genesisBlock.getNumber()));
@@ -2516,7 +2562,7 @@ void executeMethodWithOnlyLocalCallsAllowed_localCallTx() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         Address address = new BtcECKey().toAddress(networkParameters);
@@ -2540,7 +2586,7 @@ void executeMethodWithOnlyLocalCallsAllowed_nonLocalCallTx_beforeOrchid() throws
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         Address expectedResult = new BtcECKey().toAddress(networkParameters);
 
@@ -2571,7 +2617,7 @@ void executeMethodWithOnlyLocalCallsAllowed_nonLocalCallTx() {
             BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
             Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                    bridgeSupportFactoryMock);
+                    bridgeSupportFactoryMock, signatureCache);
             when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupportMock);
             bridge.init(tx, getGenesisBlock(), null, null, null, null);
 
@@ -2602,7 +2648,7 @@ void getBtcTransactionConfirmationsBeforeWasabi() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
 
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
@@ -2621,7 +2667,7 @@ void getBtcTransactionConfirmationsAfterWasabi_ok() throws Exception {
 
         BiFunction<List<Sha256Hash>, Integer, MerkleBranch> merkleBranchFactory = mock(BiFunction.class);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock, merkleBranchFactory);
+                bridgeSupportFactoryMock, merkleBranchFactory, signatureCache);
 
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -2679,11 +2725,12 @@ void getBtcTransactionConfirmationsAfterWasabi_errorInBridgeSupport() throws Exc
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         BiFunction<List<Sha256Hash>, Integer, MerkleBranch> merkleBranchFactory = mock(BiFunction.class);
         Bridge bridge = spy(new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory, merkleBranchFactory));
+                bridgeSupportFactory, merkleBranchFactory, signatureCache));
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2747,11 +2794,12 @@ void getBtcTransactionConfirmationsAfterWasabi_merkleBranchConstructionError() t
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         BiFunction<List<Sha256Hash>, Integer, MerkleBranch> merkleBranchFactory = mock(BiFunction.class);
         Bridge bridge = spy(new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory, merkleBranchFactory));
+                bridgeSupportFactory, merkleBranchFactory, signatureCache));
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2801,10 +2849,11 @@ void getBtcTransactionConfirmations_gasCost() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         Bridge bridge = spy(new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory));
+                bridgeSupportFactory, signatureCache));
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         bridge.init(txMock, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2842,9 +2891,10 @@ void getBtcBlockchainBlockHashAtDepth() throws BlockStoreException, IOException,
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), createRepository().startTracking(), null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -2861,7 +2911,7 @@ void testCallFromContract_beforeOrchid() {
 //        config.setBlockchainConfig(mockedConfig);
         blockFactory = new BlockFactory(config.getActivationConfig());
 
-        PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+        PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, signatureCache);
         EVMAssembler assembler = new EVMAssembler();
         ProgramInvoke invoke = new ProgramInvokeMockImpl();
 
@@ -2886,7 +2936,7 @@ void testCallFromContract_beforeOrchid() {
         when(tx.getHash()).thenReturn(new Keccak256("001122334455667788990011223344556677889900112233445566778899aabb"));
 
         // Run the program on the VM
-        Program program = new Program(config.getVmConfig(), precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), code, invoke, tx, new HashSet<>());
+        Program program = new Program(config.getVmConfig(), precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), code, invoke, tx, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         Exception ex = Assertions.assertThrows(NullPointerException.class, () -> {
             for (int i = 0; i < numOps; i++) {
                 vm.step(program);
@@ -2903,10 +2953,11 @@ void testCallFromContract_afterOrchid() {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
                 constants.getBridgeConstants(),
-                activationConfig);
+                activationConfig,
+                signatureCache);
 
         PrecompiledContracts precompiledContracts = new PrecompiledContracts(config,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         EVMAssembler assembler = new EVMAssembler();
         ProgramInvoke invoke = new ProgramInvokeMockImpl();
 
@@ -2931,7 +2982,7 @@ void testCallFromContract_afterOrchid() {
         when(tx.getHash()).thenReturn(new Keccak256("001122334455667788990011223344556677889900112233445566778899aabb"));
 
         // Run the program on the VM
-        Program program = new Program(config.getVmConfig(), precompiledContracts, blockFactory, activationConfig.forBlock(0), code, invoke, tx, new HashSet<>());
+        Program program = new Program(config.getVmConfig(), precompiledContracts, blockFactory, activationConfig.forBlock(0), code, invoke, tx, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         try {
             for (int i = 0; i < numOps; i++) {
                 vm.step(program);
@@ -2944,7 +2995,7 @@ void testCallFromContract_afterOrchid() {
 
     @Test
     void localCallOnlyMethodsDefinition() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
 
         // To force initialization
         String foo = Bridge.UPDATE_COLLECTIONS.name;
@@ -2985,7 +3036,7 @@ void localCallOnlyMethodsDefinition() {
 
     @Test
     void mineableMethodsDefinition() {
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, null, signatureCache);
 
         // To force initialization
         String foo = Bridge.UPDATE_COLLECTIONS.name;
@@ -3040,7 +3091,7 @@ void receiveHeadersGasCost_beforeDynamicCost() {
         Transaction txMock = mock(Transaction.class);
         when(txMock.getReceiveAddress()).thenReturn(RskAddress.nullAddress());
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                mock(BridgeSupportFactory.class));
+                mock(BridgeSupportFactory.class), signatureCache);
         bridge.init(txMock, getGenesisBlock(), null, null, null, null);
 
         for (int numberOfHeaders = 0; numberOfHeaders < 10; numberOfHeaders++) {
@@ -3060,7 +3111,7 @@ void receiveHeadersGasCost_afterDynamicCost() {
         Transaction txMock = mock(Transaction.class);
         when(txMock.getReceiveAddress()).thenReturn(RskAddress.nullAddress());
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                mock(BridgeSupportFactory.class));
+                mock(BridgeSupportFactory.class), signatureCache);
         bridge.init(txMock, getGenesisBlock(), null, null, null, null);
 
         final long BASE_COST = 66_000L;
@@ -3084,7 +3135,7 @@ void receiveHeadersAccess_beforePublic_noAccessIfNotFromFederationMember() throw
 
         RskAddress sender = new RskAddress("2acc95758f8b5f583470ba265eb685a8f45fc9d5");
         Transaction txMock = mock(Transaction.class);
-        when(txMock.getSender()).thenReturn(sender);
+        when(txMock.getSender(any(SignatureCache.class))).thenReturn(sender);
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         when(bridgeSupportMock.getRetiringFederation()).thenReturn(null);
@@ -3093,7 +3144,7 @@ void receiveHeadersAccess_beforePublic_noAccessIfNotFromFederationMember() throw
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupportMock);
         bridge.init(txMock, getGenesisBlock(), null, null, null, null);
@@ -3119,7 +3170,7 @@ void receiveHeadersAccess_beforePublic_accessIfFromFederationMember() throws Exc
 
         RskAddress sender = new RskAddress(ECKey.fromPrivate(HashUtil.keccak256("federator1".getBytes(StandardCharsets.UTF_8))).getAddress());
         Transaction txMock = mock(Transaction.class);
-        when(txMock.getSender()).thenReturn(sender);
+        when(txMock.getSender(any(SignatureCache.class))).thenReturn(sender);
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         when(bridgeSupportMock.getRetiringFederation()).thenReturn(null);
@@ -3128,7 +3179,7 @@ void receiveHeadersAccess_beforePublic_accessIfFromFederationMember() throws Exc
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupportMock);
 
@@ -3155,7 +3206,7 @@ void receiveHeadersAccess_afterPublic_accessFromAnyone() throws Exception {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupportMock);
 
@@ -3176,7 +3227,7 @@ void bridgeSupportIsCreatedOnInit() {
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(bridgeSupportMock);
@@ -3201,7 +3252,7 @@ private void executeAndCheckMethodWithAnyCallsAllowed(boolean localCall) throws
         BridgeSupportFactory bridgeSupportFactoryMock = mock(BridgeSupportFactory.class);
 
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactoryMock);
+                bridgeSupportFactoryMock, signatureCache);
 
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -3221,9 +3272,10 @@ void getBtcBlockchainInitialBlockHeight() throws IOException, VMException {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(null, getGenesisBlock(), null, null, null, null);
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
         TestUtils.setInternalState(bridge, "bridgeSupport", bridgeSupportMock);
@@ -3246,9 +3298,10 @@ private void getGasForDataPaidTx(int expected, CallTransaction.Function function
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         org.ethereum.core.Transaction rskTx;
         if (function == null) {
             rskTx = CallTransaction.createRawTransaction(
@@ -3306,9 +3359,10 @@ private void registerBtcTransactionWithHugeDeclaredSize(BtcTransaction tx) throw
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(bridgeConstants.getBtcParams()),
                 bridgeConstants,
-                activationConfig);
+                activationConfig,
+                signatureCache);
         Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                bridgeSupportFactory);
+                bridgeSupportFactory, signatureCache);
         bridge.init(rskTx, getGenesisBlock(), track, null, null, null);
 
         byte[] serializedTx = tx.bitcoinSerialize();
@@ -3323,7 +3377,7 @@ private Bridge getBridgeInstance(ActivationConfig.ForBlock activations) {
         when(bridgeSupportFactoryMock.newInstance(any(), any(), any(), any())).thenReturn(mock(BridgeSupport.class));
 
         when(activationConfig.forBlock(anyLong())).thenReturn(activations);
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactoryMock);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactoryMock, signatureCache);
         bridge.init(mock(Transaction.class), getGenesisBlock(), null, null, null, null);
 
         return bridge;
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeUtilsTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeUtilsTest.java
index bfe116f577b..8baf4cafb5b 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeUtilsTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeUtilsTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg;
 
 import co.rsk.bitcoinj.core.*;
@@ -2068,6 +2067,7 @@ void testIsContractTx() {
                 null,
                 null,
                 null,
+                null,
                 null
             ))
         );
@@ -3130,12 +3130,14 @@ private void assertIsWatching(Address address, Wallet wallet, NetworkParameters
     }
 
     private void isFreeBridgeTx(boolean expected, RskAddress destinationAddress, byte[] privKeyBytes) {
+        SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
             new RepositoryBtcBlockStoreWithCache.Factory(constants.getBridgeConstants().getBtcParams()),
             constants.getBridgeConstants(),
-            activationConfig);
+            activationConfig,
+                signatureCache);
 
-        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory);
+        Bridge bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig, bridgeSupportFactory, signatureCache);
         org.ethereum.core.Transaction rskTx = CallTransaction.createCallTransaction(
             0,
             1,
@@ -3149,7 +3151,7 @@ private void isFreeBridgeTx(boolean expected, RskAddress destinationAddress, byt
         Repository repository = new MutableRepository(new MutableTrieCache(new MutableTrieImpl(trieStore, new Trie())));
         Block rskExecutionBlock = new BlockGenerator().createChildBlock(getGenesisInstance(trieStore));
         bridge.init(rskTx, rskExecutionBlock, repository.startTracking(), null, null, null);
-        Assertions.assertEquals(expected, BridgeUtils.isFreeBridgeTx(rskTx, constants, activationConfig.forBlock(rskExecutionBlock.getNumber())));
+        Assertions.assertEquals(expected, BridgeUtils.isFreeBridgeTx(rskTx, constants, activationConfig.forBlock(rskExecutionBlock.getNumber()), signatureCache));
     }
 
     private Genesis getGenesisInstance(TrieStore trieStore) {
diff --git a/rskj-core/src/test/java/co/rsk/peg/RskForksBridgeTest.java b/rskj-core/src/test/java/co/rsk/peg/RskForksBridgeTest.java
index 5682b9d951f..c956f52a37b 100644
--- a/rskj-core/src/test/java/co/rsk/peg/RskForksBridgeTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/RskForksBridgeTest.java
@@ -474,7 +474,7 @@ private BridgeState callGetStateForDebuggingTx() throws IOException {
                 null,
                 new BlockFactory(beforeBambooProperties.getActivationConfig()),
                 new ProgramInvokeFactoryImpl(),
-                new PrecompiledContracts(beforeBambooProperties, world.getBridgeSupportFactory()),
+                new PrecompiledContracts(beforeBambooProperties, world.getBridgeSupportFactory(), world.getBlockTxSignatureCache()),
                 world.getBlockTxSignatureCache()
         );
         Repository track = repository.startTracking();
diff --git a/rskj-core/src/test/java/co/rsk/peg/performance/BridgePerformanceTestCase.java b/rskj-core/src/test/java/co/rsk/peg/performance/BridgePerformanceTestCase.java
index 0f1c97dc2b5..0e2957920a0 100644
--- a/rskj-core/src/test/java/co/rsk/peg/performance/BridgePerformanceTestCase.java
+++ b/rskj-core/src/test/java/co/rsk/peg/performance/BridgePerformanceTestCase.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg.performance;
 
 import co.rsk.bitcoinj.core.*;
@@ -30,9 +29,7 @@
 import co.rsk.trie.Trie;
 import co.rsk.trie.TrieStore;
 import co.rsk.trie.TrieStoreImpl;
-import org.ethereum.core.Blockchain;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.datasource.HashMapDB;
@@ -99,6 +96,7 @@ public static TxBuilder getTxBuilderWithInternalTransaction(RskAddress sender){
                         null,
                         null,
                         null,
+                        null,
                         null
                 );
                 return internalTx;
@@ -255,11 +253,13 @@ public Environment build(int executionIndex, TxBuilder txBuilder, int height) th
 //                Factory btcBlockStoreFactory = new RepositoryBtcBlockStoreWithCache.Factory(
 //                        constants.getBridgeConstants().getBtcParams());
 
+                SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+
                 BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
-                        btcBlockStoreFactory, constants.getBridgeConstants(), activationConfig);
+                        btcBlockStoreFactory, constants.getBridgeConstants(), activationConfig, signatureCache);
 
                 bridge = new Bridge(PrecompiledContracts.BRIDGE_ADDR, constants, activationConfig,
-                        bridgeSupportFactory);
+                        bridgeSupportFactory, signatureCache);
                 BlockChainBuilder blockChainBuilder = new BlockChainBuilder();
                 Blockchain blockchain = blockChainBuilder.ofSize(height);
                 Transaction tx = txBuilder.build(executionIndex);
diff --git a/rskj-core/src/test/java/co/rsk/peg/utils/BridgeEventLoggerImplTest.java b/rskj-core/src/test/java/co/rsk/peg/utils/BridgeEventLoggerImplTest.java
index 3c09091ae2b..733e9faf91f 100644
--- a/rskj-core/src/test/java/co/rsk/peg/utils/BridgeEventLoggerImplTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/utils/BridgeEventLoggerImplTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.peg.utils;
 
 import co.rsk.bitcoinj.core.*;
@@ -27,9 +26,7 @@
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.CallTransaction;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.LogInfo;
@@ -47,6 +44,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -63,12 +61,14 @@ class BridgeEventLoggerImplTest {
     private BridgeEventLogger eventLogger;
     private BtcTransaction btcTxMock;
     private BtcTransaction btcTx;
+    private SignatureCache signatureCache;
     private ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
 
     @BeforeEach
     void setup() {
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
         eventLogs = new LinkedList<>();
-        eventLogger = new BridgeEventLoggerImpl(CONSTANTS, activations, eventLogs);
+        eventLogger = new BridgeEventLoggerImpl(CONSTANTS, activations, eventLogs, signatureCache);
         btcTxMock = mock(BtcTransaction.class);
         btcTx = new BtcTransaction(CONSTANTS.getBtcParams());
     }
@@ -118,7 +118,7 @@ void logLockBtc_with_segwit_address() {
     void logPeginBtc() {
         // Setup event logger
         List<LogInfo> eventLogs = new LinkedList<>();
-        BridgeEventLogger eventLogger = new BridgeEventLoggerImpl(null, activations, eventLogs);
+        BridgeEventLogger eventLogger = new BridgeEventLoggerImpl(null, activations, eventLogs, signatureCache);
 
         RskAddress rskAddress = mock(RskAddress.class);
         when(rskAddress.toString()).thenReturn("0x00000000000000000000000000000000000000");
@@ -160,14 +160,14 @@ void logUpdateCollections() {
         Transaction tx = mock(Transaction.class);
         RskAddress sender = mock(RskAddress.class);
         when(sender.toString()).thenReturn("0x0000000000000000000000000000000000000001");
-        when(tx.getSender()).thenReturn(sender);
+        when(tx.getSender(any(SignatureCache.class))).thenReturn(sender);
 
         // Act
         eventLogger.logUpdateCollections(tx);
 
         commonAssertLogs(eventLogs);
         assertTopics(1, eventLogs);
-        assertEvent(eventLogs, 0, BridgeEvents.UPDATE_COLLECTIONS.getEvent(), new Object[]{}, new Object[]{tx.getSender().toString()});
+        assertEvent(eventLogs, 0, BridgeEvents.UPDATE_COLLECTIONS.getEvent(), new Object[]{}, new Object[]{tx.getSender(signatureCache).toString()});
     }
 
     @Test
@@ -278,7 +278,7 @@ void logRejectedPegin() {
         // Setup event logger
         List<LogInfo> eventLogs = new LinkedList<>();
 
-        BridgeEventLogger eventLogger = new BridgeEventLoggerImpl(null, activations, eventLogs);
+        BridgeEventLogger eventLogger = new BridgeEventLoggerImpl(null, activations, eventLogs, signatureCache);
 
         BtcTransaction btcTx = new BtcTransaction(BridgeRegTestConstants.getInstance().getBtcParams());
 
@@ -312,7 +312,7 @@ void logUnrefundablePegin() {
         // Setup event logger
         List<LogInfo> eventLogs = new LinkedList<>();
 
-        BridgeEventLogger eventLogger = new BridgeEventLoggerImpl(null, activations, eventLogs);
+        BridgeEventLogger eventLogger = new BridgeEventLoggerImpl(null, activations, eventLogs, signatureCache);
 
         BtcTransaction btcTx = new BtcTransaction(BridgeRegTestConstants.getInstance().getBtcParams());
 
diff --git a/rskj-core/src/test/java/co/rsk/peg/utils/BridgeEventLoggerLegacyImplTest.java b/rskj-core/src/test/java/co/rsk/peg/utils/BridgeEventLoggerLegacyImplTest.java
index 8d9dc7d3882..f85ff6e6be0 100644
--- a/rskj-core/src/test/java/co/rsk/peg/utils/BridgeEventLoggerLegacyImplTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/utils/BridgeEventLoggerLegacyImplTest.java
@@ -27,8 +27,7 @@
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.util.RLP;
 import org.ethereum.util.RLPElement;
 import org.ethereum.util.RLPList;
@@ -70,7 +69,7 @@ void setup() {
         activations = mock(ActivationConfig.ForBlock.class);
         eventLogs = new LinkedList<>();
         constantsMock = mock(BridgeConstants.class);
-        eventLogger = new BrigeEventLoggerLegacyImpl(constantsMock, activations, eventLogs);
+        eventLogger = new BrigeEventLoggerLegacyImpl(constantsMock, activations, eventLogs, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         btcTxMock = mock(BtcTransaction.class);
         rskTxHash = PegTestUtils.createHash3(1);
     }
@@ -83,7 +82,7 @@ void testLogUpdateCollectionsBeforeRskip146() {
         Transaction tx = mock(Transaction.class);
         RskAddress sender = mock(RskAddress.class);
         when(sender.toString()).thenReturn("0x0000000000000000000000000000000000000001");
-        when(tx.getSender()).thenReturn(sender);
+        when(tx.getSender(any(SignatureCache.class))).thenReturn(sender);
 
         // Act
         eventLogger.logUpdateCollections(tx);
@@ -98,7 +97,7 @@ void testLogUpdateCollectionsBeforeRskip146() {
         }
 
         // Assert log data
-        byte[] encodedData = RLP.encodeElement(tx.getSender().getBytes());
+        byte[] encodedData = RLP.encodeElement(tx.getSender(new BlockTxSignatureCache(new ReceivedTxSignatureCache())).getBytes());
         Assertions.assertArrayEquals(encodedData, logResult.getData());
     }
 
diff --git a/rskj-core/src/test/java/co/rsk/remasc/RemascProcessMinerFeesTest.java b/rskj-core/src/test/java/co/rsk/remasc/RemascProcessMinerFeesTest.java
index bf9ab02fefe..50f55bcf408 100644
--- a/rskj-core/src/test/java/co/rsk/remasc/RemascProcessMinerFeesTest.java
+++ b/rskj-core/src/test/java/co/rsk/remasc/RemascProcessMinerFeesTest.java
@@ -1006,10 +1006,12 @@ private RemascStorageProvider getRemascStorageProvider(RepositorySnapshot reposi
     }
 
     private BlockExecutor buildBlockExecutor(RepositoryLocator repositoryLocator, BlockStore blockStore) {
+        SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                 config.getNetworkConstants().getBridgeConstants(),
-                config.getActivationConfig());
+                config.getActivationConfig(), signatureCache);
 
         return new BlockExecutor(
                 config.getActivationConfig(),
@@ -1020,7 +1022,7 @@ private BlockExecutor buildBlockExecutor(RepositoryLocator repositoryLocator, Bl
                         null,
                         blockFactory,
                         new ProgramInvokeFactoryImpl(),
-                        new PrecompiledContracts(config, bridgeSupportFactory),
+                        new PrecompiledContracts(config, bridgeSupportFactory, signatureCache),
                         new BlockTxSignatureCache(new ReceivedTxSignatureCache())
                 )
         );
diff --git a/rskj-core/src/test/java/co/rsk/remasc/RemascStorageProviderTest.java b/rskj-core/src/test/java/co/rsk/remasc/RemascStorageProviderTest.java
index c8acf8e187e..22f32c8d64b 100644
--- a/rskj-core/src/test/java/co/rsk/remasc/RemascStorageProviderTest.java
+++ b/rskj-core/src/test/java/co/rsk/remasc/RemascStorageProviderTest.java
@@ -439,10 +439,12 @@ void paysOnlyBlocksWithEnoughBalanceAccumulatedAfterRFS() throws IOException {
 
         blocks.addAll(createSimpleBlocks(blocks.get(blocks.size()-1),10, coinbase));
 
+        SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(
                         config.getNetworkConstants().getBridgeConstants().getBtcParams()),
-                config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig());
+                config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig(), signatureCache);
 
         BlockExecutor blockExecutor = new BlockExecutor(
                 config.getActivationConfig(),
@@ -453,7 +455,7 @@ void paysOnlyBlocksWithEnoughBalanceAccumulatedAfterRFS() throws IOException {
                         null,
                         new BlockFactory(config.getActivationConfig()),
                         new ProgramInvokeFactoryImpl(),
-                        new PrecompiledContracts(config, bridgeSupportFactory),
+                        new PrecompiledContracts(config, bridgeSupportFactory, signatureCache),
                         new BlockTxSignatureCache(new ReceivedTxSignatureCache())
                 )
         );
diff --git a/rskj-core/src/test/java/co/rsk/remasc/RemascTestRunner.java b/rskj-core/src/test/java/co/rsk/remasc/RemascTestRunner.java
index 997ce1c4d35..54b678fa107 100644
--- a/rskj-core/src/test/java/co/rsk/remasc/RemascTestRunner.java
+++ b/rskj-core/src/test/java/co/rsk/remasc/RemascTestRunner.java
@@ -133,8 +133,8 @@ public void start() {
                 new RepositoryBtcBlockStoreWithCache.Factory(
                         builder.getConfig().getNetworkConstants().getBridgeConstants().getBtcParams()),
                 builder.getConfig().getNetworkConstants().getBridgeConstants(),
-                builder.getConfig().getActivationConfig());
-        PrecompiledContracts precompiledContracts = new PrecompiledContracts(builder.getConfig(), bridgeSupportFactory);
+                builder.getConfig().getActivationConfig(), blockTxSignatureCache);
+        PrecompiledContracts precompiledContracts = new PrecompiledContracts(builder.getConfig(), bridgeSupportFactory, blockTxSignatureCache);
         BlockExecutor blockExecutor = new BlockExecutor(
                 builder.getConfig().getActivationConfig(),
                 builder.getRepositoryLocator(),
diff --git a/rskj-core/src/test/java/co/rsk/rpc/Web3EthModuleTest.java b/rskj-core/src/test/java/co/rsk/rpc/Web3EthModuleTest.java
index 021a862719f..e91284aebb7 100644
--- a/rskj-core/src/test/java/co/rsk/rpc/Web3EthModuleTest.java
+++ b/rskj-core/src/test/java/co/rsk/rpc/Web3EthModuleTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.rpc;
 
 import co.rsk.config.RskSystemProperties;
@@ -34,7 +33,9 @@
 import co.rsk.rpc.modules.rsk.RskModule;
 import co.rsk.rpc.modules.txpool.TxPoolModule;
 import co.rsk.scoring.PeerScoringManager;
+import org.ethereum.core.BlockTxSignatureCache;
 import org.ethereum.core.Blockchain;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.db.BlockStore;
 import org.ethereum.db.ReceiptStore;
 import org.ethereum.facade.Ethereum;
@@ -79,7 +80,8 @@ null, mock(RskModule.class),
                 mock(BuildInfo.class),
                 mock(BlocksBloomStore.class),
                 mock(Web3InformationRetriever.class),
-                mock(SyncProcessor.class));
+                mock(SyncProcessor.class),
+                new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         assertThat(web3.eth_chainId(), is("0x21"));
     }
diff --git a/rskj-core/src/test/java/co/rsk/rpc/Web3ImplRpcTest.java b/rskj-core/src/test/java/co/rsk/rpc/Web3ImplRpcTest.java
index 38121611e13..d28d6566aff 100644
--- a/rskj-core/src/test/java/co/rsk/rpc/Web3ImplRpcTest.java
+++ b/rskj-core/src/test/java/co/rsk/rpc/Web3ImplRpcTest.java
@@ -48,7 +48,7 @@ void getRpcModules() {
                             null, null, null, null,
                             null, null, null, null,
                             null, null, null, null, null,
-                            null, null, null, null, null, null, null);
+                            null, null, null, null, null, null, null, null);
 
         Map<String, String> result = web3.rpc_modules();
 
diff --git a/rskj-core/src/test/java/co/rsk/rpc/modules/eth/EthModuleTest.java b/rskj-core/src/test/java/co/rsk/rpc/modules/eth/EthModuleTest.java
index ce9449a10ca..7c88cf113ee 100644
--- a/rskj-core/src/test/java/co/rsk/rpc/modules/eth/EthModuleTest.java
+++ b/rskj-core/src/test/java/co/rsk/rpc/modules/eth/EthModuleTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.rpc.modules.eth;
 
 import co.rsk.config.BridgeConstants;
@@ -53,6 +52,7 @@
 class EthModuleTest {
 
     private final TestSystemProperties config = new TestSystemProperties();
+    private SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
 
     @Test
     void callSmokeTest() {
@@ -84,7 +84,7 @@ void callSmokeTest() {
                 null,
                 null,
                 new BridgeSupportFactory(
-                        null, null, null),
+                        null, null, null, signatureCache),
                 config.getGasEstimationCap());
 
         String expectedResult = HexUtils.toUnformattedJsonHex(hReturn);
@@ -123,7 +123,7 @@ void callWithoutReturn() {
                 null,
                 null,
                 new BridgeSupportFactory(
-                        null, null, null),
+                        null, null, null, signatureCache),
                 config.getGasEstimationCap());
 
         String expectedResult = HexUtils.toUnformattedJsonHex(hReturn);
@@ -167,7 +167,7 @@ void test_revertedTransaction() {
                 null,
                 null,
                 new BridgeSupportFactory(
-                        null, null, null),
+                        null, null, null, signatureCache),
                 config.getGasEstimationCap());
 
         try {
@@ -257,7 +257,8 @@ void getCode() {
                 new BridgeSupportFactory(
                         null,
                         null,
-                        null
+                        null,
+                        signatureCache
                 ),
                 config.getGasEstimationCap()
         );
diff --git a/rskj-core/src/test/java/co/rsk/rpc/modules/trace/TraceModuleImplTest.java b/rskj-core/src/test/java/co/rsk/rpc/modules/trace/TraceModuleImplTest.java
index abe91426011..a5d440c97e9 100644
--- a/rskj-core/src/test/java/co/rsk/rpc/modules/trace/TraceModuleImplTest.java
+++ b/rskj-core/src/test/java/co/rsk/rpc/modules/trace/TraceModuleImplTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.rpc.modules.trace;
 
 import co.rsk.config.GasLimitConfig;
@@ -35,10 +34,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.ethereum.core.Account;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.datasource.HashMapDB;
 import org.ethereum.db.ReceiptStore;
 import org.ethereum.db.ReceiptStoreImpl;
@@ -60,7 +56,7 @@ void retrieveUnknownTransactionAsNull() throws Exception {
         ReceiptStore receiptStore = new ReceiptStoreImpl(new HashMapDB());
         World world = new World(receiptStore);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction("0x00");
 
@@ -72,7 +68,7 @@ void retrieveUnknownBlockAsNull() throws Exception {
         ReceiptStore receiptStore = new ReceiptStoreImpl(new HashMapDB());
         World world = new World(receiptStore);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceBlock("0x0001020300010203000102030001020300010203000102030001020300010203");
 
@@ -85,7 +81,7 @@ void retrievePendingBlock() throws Exception {
         World world = executeMultiContract(receiptStore);
         ExecutionBlockRetriever executionBlockRetriever = createExecutionBlockRetriever(world);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), executionBlockRetriever);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), executionBlockRetriever, world.getBlockTxSignatureCache());
 
         world.getTransactionPool().addTransaction(createSampleTransaction());
 
@@ -110,7 +106,7 @@ void retrieveSimpleContractCreationTrace() throws Exception {
 
         Transaction transaction = world.getTransactionByName("tx01");
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -144,7 +140,7 @@ void retrieveEmptyContractCreationTrace() throws Exception {
 
         Transaction transaction = world.getTransactionByName("tx01");
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -200,7 +196,7 @@ void getASingleTrace() throws Exception {
         ReceiptStore receiptStore = new ReceiptStoreImpl(new HashMapDB());
         World world = executeMultiContract(receiptStore);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         String transactionHash = "0x64cbd00a73bad9df13ee188931c84555a5662057e6381b3476bdc20ab3c09ef3";
         JsonNode result = traceModule.traceGet(transactionHash, Stream.of("0x0").collect(Collectors.toList()));
@@ -213,7 +209,7 @@ void getASingleTrace() throws Exception {
     private static void retrieveEmptyBlockTrace(World world, ReceiptStore receiptStore, String blkname) throws Exception {
         Block block = world.getBlockByName(blkname);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceBlock(block == null ? blkname : block.getHash().toJsonString());
 
@@ -228,7 +224,7 @@ private static void retrieveEmptyBlockTrace(World world, ReceiptStore receiptSto
     private static void retrieveNestedContractCreationBlockTrace(World world, ReceiptStore receiptStore, String blkname) throws Exception {
         Block block = world.getBlockByName(blkname);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceBlock(block == null ? blkname : block.getHash().toJsonString());
 
@@ -260,7 +256,7 @@ private static void retrieveNestedContractCreationBlockTrace(World world, Receip
     private static void retrieveNestedContractCreationTrace(World world, ReceiptStore receiptStore, String txname) throws Exception {
         Transaction transaction = world.getTransactionByName(txname);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -284,7 +280,7 @@ private static void retrieveNestedContractCreationTrace(World world, ReceiptStor
     private static void retrieveNestedContractInvocationTrace(World world, ReceiptStore receiptStore, String txname) throws Exception {
         Transaction transaction = world.getTransactionByName(txname);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -308,7 +304,7 @@ private static void retrieveNestedContractInvocationTrace(World world, ReceiptSt
     private static void retrieveNestedRevertedInvocationTrace(World world, ReceiptStore receiptStore, String txname) throws Exception {
         Transaction transaction = world.getTransactionByName(txname);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -332,7 +328,7 @@ private static void retrieveNestedRevertedInvocationTrace(World world, ReceiptSt
     private static void retrieveSuicideInvocationTrace(World world, ReceiptStore receiptStore, String txname) throws Exception {
         Transaction transaction = world.getTransactionByName(txname);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -359,7 +355,7 @@ private static void retrieveSuicideInvocationTrace(World world, ReceiptStore rec
     private static void retrieveSuicideInvocationBlockTrace(World world, ReceiptStore receiptStore, String blkname) throws Exception {
         Block block = world.getBlockByName(blkname);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceBlock(block == null ? blkname : block.getHash().toJsonString());
 
@@ -384,7 +380,7 @@ private static void retrieveSuicideInvocationBlockTrace(World world, ReceiptStor
     }
 
     private static void retrieveTraceFilterEmpty(World world, ReceiptStore receiptStore) throws Exception {
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         TraceFilterRequest traceFilterRequest = new TraceFilterRequest();
 
@@ -404,7 +400,7 @@ private static void retrieveTraceFilterEmpty(World world, ReceiptStore receiptSt
     private static void retrieveTraceFilterPending(World world, ReceiptStore receiptStore) throws Exception {
         ExecutionBlockRetriever executionBlockRetriever = createExecutionBlockRetriever(world);
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), executionBlockRetriever);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), executionBlockRetriever, world.getBlockTxSignatureCache());
 
         world.getTransactionPool().addTransaction(createSampleTransaction());
 
@@ -457,7 +453,8 @@ private static ExecutionBlockRetriever createExecutionBlockRetriever(World world
                 new BlockFactory(rskSystemProperties.getActivationConfig()),
                 world.getBlockExecutor(),
                 new MinimumGasPriceCalculator(Coin.valueOf(miningConfig.getMinGasPriceTarget())),
-                new MinerUtils()
+                new MinerUtils(),
+                world.getBlockTxSignatureCache()
         );
 
         return new ExecutionBlockRetriever(world.getBlockChain(), builder, mock(CompositeEthereumListener.class));
@@ -476,7 +473,7 @@ private static Transaction createSampleTransaction() {
     }
 
     private static void retrieveTraceFilter1Record(World world, ReceiptStore receiptStore) throws Exception {
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         TraceFilterRequest traceFilterRequest = new TraceFilterRequest();
 
@@ -503,7 +500,7 @@ private static void retrieveTraceFilter1Record(World world, ReceiptStore receipt
     }
 
     private static void retrieveTraceFilter3Records(World world, ReceiptStore receiptStore) throws Exception {
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         TraceFilterRequest traceFilterRequest = new TraceFilterRequest();
 
@@ -540,7 +537,7 @@ private static void retrieveTraceFilter3Records(World world, ReceiptStore receip
     }
 
     private static void retrieveTraceFilterNext3RecordsAndOnly1Remains(World world, ReceiptStore receiptStore) throws Exception {
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         TraceFilterRequest traceFilterRequest = new TraceFilterRequest();
 
@@ -566,7 +563,7 @@ private static void retrieveTraceFilterNext3RecordsAndOnly1Remains(World world,
     }
 
     private static void retrieveTraceFilterByAddress(World world, ReceiptStore receiptStore) throws Exception {
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         TraceFilterRequest traceFilterRequest = new TraceFilterRequest();
 
@@ -600,7 +597,7 @@ void retrieveSimpleContractInvocationTrace() throws Exception {
 
         Transaction transaction = world.getTransactionByName("tx02");
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -629,7 +626,7 @@ void retrieveSimpleAccountTransfer() throws Exception {
 
         Transaction transaction = world.getTransactionByName("tx01");
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -664,7 +661,7 @@ void executeContractWithCall() throws Exception {
 
         Transaction transaction = world.getTransactionByName("tx01");
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -702,7 +699,7 @@ void executeContractWithDelegateCall() throws Exception {
 
         Transaction transaction = world.getTransactionByName("tx01");
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
@@ -734,7 +731,7 @@ void executeContractWithCreate2() throws Exception {
 
         Transaction transaction = world.getTransactionByName("tx01");
 
-        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null);
+        TraceModuleImpl traceModule = new TraceModuleImpl(world.getBlockChain(), world.getBlockStore(), receiptStore, world.getBlockExecutor(), null, world.getBlockTxSignatureCache());
 
         JsonNode result = traceModule.traceTransaction(transaction.getHash().toJsonString());
 
diff --git a/rskj-core/src/test/java/co/rsk/rpc/modules/txpool/TxPoolModuleImplTest.java b/rskj-core/src/test/java/co/rsk/rpc/modules/txpool/TxPoolModuleImplTest.java
index de72d2f3f84..c5edbb78924 100644
--- a/rskj-core/src/test/java/co/rsk/rpc/modules/txpool/TxPoolModuleImplTest.java
+++ b/rskj-core/src/test/java/co/rsk/rpc/modules/txpool/TxPoolModuleImplTest.java
@@ -27,9 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.ethereum.core.Account;
-import org.ethereum.core.Transaction;
-import org.ethereum.core.TransactionPool;
+import org.ethereum.core.*;
 import org.ethereum.rpc.Web3Mocks;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -50,10 +48,10 @@ class TxPoolModuleImplTest {
     private Map<Integer, Account> accountMap;
 
     @BeforeEach
-    void setup(){
+    void setup() {
         transactionPool = Web3Mocks.getMockTransactionPool();
-        txPoolModule = new TxPoolModuleImpl(transactionPool);
-        accountMap = new HashMap();
+        txPoolModule = new TxPoolModuleImpl(transactionPool, new ReceivedTxSignatureCache());
+        accountMap = new HashMap<>();
     }
 
     private Transaction createSampleTransaction() {
@@ -433,4 +431,4 @@ private void assertFullTransaction(Transaction tx, JsonNode transactionNode) {
     private void assertSummaryTransaction(Transaction tx, JsonNode summaryNode) {
         Assertions.assertEquals(tx.getReceiveAddress().toString() + ": " + tx.getValue().toString() + " wei + " + tx.getGasLimitAsInteger().toString() + " x " + tx.getGasPrice().toString() + " gas", summaryNode.asText());
     }
-}
+}
\ No newline at end of file
diff --git a/rskj-core/src/test/java/co/rsk/test/World.java b/rskj-core/src/test/java/co/rsk/test/World.java
index a20e3122b54..ad909e61663 100644
--- a/rskj-core/src/test/java/co/rsk/test/World.java
+++ b/rskj-core/src/test/java/co/rsk/test/World.java
@@ -141,7 +141,8 @@ public World(
                 new RepositoryBtcBlockStoreWithCache.Factory(
                         config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                 config.getNetworkConstants().getBridgeConstants(),
-                config.getActivationConfig());
+                config.getActivationConfig(),
+                blockTxSignatureCache);
         this.receivedTxSignatureCache = new ReceivedTxSignatureCache();
         this.blockTxSignatureCache = new BlockTxSignatureCache(receivedTxSignatureCache);
     }
@@ -169,7 +170,7 @@ public BlockExecutor getBlockExecutor() {
                 config.getNetworkConstants().getBridgeConstants().getBtcParams());
 
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
-                btcBlockStoreFactory, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig());
+                btcBlockStoreFactory, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig(), blockTxSignatureCache);
 
         if (this.blockExecutor == null) {
             this.blockExecutor = new BlockExecutor(
@@ -181,7 +182,7 @@ public BlockExecutor getBlockExecutor() {
                             null,
                             new BlockFactory(config.getActivationConfig()),
                             programInvokeFactory,
-                            new PrecompiledContracts(config, bridgeSupportFactory),
+                            new PrecompiledContracts(config, bridgeSupportFactory, blockTxSignatureCache),
                             blockTxSignatureCache
                     )
             );
diff --git a/rskj-core/src/test/java/co/rsk/test/builders/BlockBuilder.java b/rskj-core/src/test/java/co/rsk/test/builders/BlockBuilder.java
index b2814c8a3b8..c680bf60e3f 100644
--- a/rskj-core/src/test/java/co/rsk/test/builders/BlockBuilder.java
+++ b/rskj-core/src/test/java/co/rsk/test/builders/BlockBuilder.java
@@ -114,7 +114,7 @@ public Block build() {
                             null,
                             new BlockFactory(config.getActivationConfig()),
                             new ProgramInvokeFactoryImpl(),
-                            new PrecompiledContracts(config, bridgeSupportFactory),
+                            new PrecompiledContracts(config, bridgeSupportFactory, new BlockTxSignatureCache(new ReceivedTxSignatureCache())),
                             new BlockTxSignatureCache(new ReceivedTxSignatureCache())
                     )
             );
diff --git a/rskj-core/src/test/java/co/rsk/test/builders/BlockChainBuilder.java b/rskj-core/src/test/java/co/rsk/test/builders/BlockChainBuilder.java
index 60e55bf8a8f..54c24e9d41f 100644
--- a/rskj-core/src/test/java/co/rsk/test/builders/BlockChainBuilder.java
+++ b/rskj-core/src/test/java/co/rsk/test/builders/BlockChainBuilder.java
@@ -72,9 +72,11 @@ public class BlockChainBuilder {
     private RepositoryLocator repositoryLocator;
     private TrieStore trieStore;
     private boolean requireUnclesValidation;
+    private SignatureCache signatureCache;
 
     public BlockChainBuilder() {
         this.requireUnclesValidation = true; // default
+        this.signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
     }
 
     public BlockChainBuilder setTesting(boolean value) {
@@ -212,7 +214,8 @@ public BlockChainImpl build() {
                     new RepositoryBtcBlockStoreWithCache.Factory(
                             config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                     config.getNetworkConstants().getBridgeConstants(),
-                    config.getActivationConfig());
+                    config.getActivationConfig(),
+                    signatureCache);
         }
 
         BlockValidatorBuilder validatorBuilder = new BlockValidatorBuilder();
@@ -235,7 +238,7 @@ public BlockChainImpl build() {
                 receiptStore,
                 blockFactory,
                 new ProgramInvokeFactoryImpl(),
-                new PrecompiledContracts(config, bridgeSupportFactory),
+                new PrecompiledContracts(config, bridgeSupportFactory, signatureCache),
                 blockTxSignatureCache
         );
         repositoryLocator = new RepositoryLocator(trieStore, stateRootHandler);
diff --git a/rskj-core/src/test/java/co/rsk/test/builders/BridgeSupportBuilder.java b/rskj-core/src/test/java/co/rsk/test/builders/BridgeSupportBuilder.java
index 13a886b876b..65dc5402c77 100644
--- a/rskj-core/src/test/java/co/rsk/test/builders/BridgeSupportBuilder.java
+++ b/rskj-core/src/test/java/co/rsk/test/builders/BridgeSupportBuilder.java
@@ -12,8 +12,7 @@
 import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
 import co.rsk.peg.utils.BridgeEventLogger;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
-import org.ethereum.core.Block;
-import org.ethereum.core.Repository;
+import org.ethereum.core.*;
 
 public class BridgeSupportBuilder {
     private BridgeConstants bridgeConstants;
@@ -25,6 +24,7 @@ public class BridgeSupportBuilder {
     private Block executionBlock;
     private Factory btcBlockStoreFactory;
     private ActivationConfig.ForBlock activations;
+    private SignatureCache signatureCache;
 
     public BridgeSupportBuilder() {
         this.bridgeConstants = mock(BridgeConstants.class);
@@ -36,6 +36,7 @@ public BridgeSupportBuilder() {
         this.executionBlock = mock(Block.class);
         this.btcBlockStoreFactory = mock(Factory.class);
         this.activations = mock(ActivationConfig.ForBlock.class);
+        this.signatureCache = mock(BlockTxSignatureCache.class);
     }
 
     public BridgeSupportBuilder withBridgeConstants(BridgeConstants bridgeConstants) {
@@ -83,6 +84,11 @@ public BridgeSupportBuilder withActivations(ActivationConfig.ForBlock activation
         return this;
     }
 
+    public BridgeSupportBuilder withSignatureCache(SignatureCache signatureCache) {
+        this.signatureCache = signatureCache;
+        return this;
+    }
+
     public BridgeSupport build() {
         return new BridgeSupport(
             bridgeConstants,
@@ -95,7 +101,8 @@ public BridgeSupport build() {
             new Context(bridgeConstants.getBtcParams()),
             new FederationSupport(bridgeConstants, provider, executionBlock),
             btcBlockStoreFactory,
-            activations
+            activations,
+            signatureCache
         );
     }
 }
diff --git a/rskj-core/src/test/java/co/rsk/validators/BlockTxsValidationRuleTest.java b/rskj-core/src/test/java/co/rsk/validators/BlockTxsValidationRuleTest.java
index 5389a23a557..c2014d0d78e 100644
--- a/rskj-core/src/test/java/co/rsk/validators/BlockTxsValidationRuleTest.java
+++ b/rskj-core/src/test/java/co/rsk/validators/BlockTxsValidationRuleTest.java
@@ -23,9 +23,7 @@
 import co.rsk.db.RepositorySnapshot;
 import org.bouncycastle.util.BigIntegers;
 import org.ethereum.TestUtils;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockHeader;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,6 +31,7 @@
 import java.math.BigInteger;
 import java.util.Arrays;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -41,6 +40,7 @@ class BlockTxsValidationRuleTest {
     private BlockTxsValidationRule rule;
     private RepositorySnapshot repositorySnapshot;
     private Block parent;
+    private SignatureCache signatureCache;
 
     @BeforeEach
     void setup() {
@@ -52,7 +52,9 @@ void setup() {
         repositorySnapshot = mock(RepositorySnapshot.class);
         when(repositoryLocator.snapshotAt(parentHeader)).thenReturn(repositorySnapshot);
 
-        rule = new BlockTxsValidationRule(repositoryLocator, null); // TODO -> set useful mock here
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+
+        rule = new BlockTxsValidationRule(repositoryLocator, signatureCache);
     }
 
     @Test
@@ -139,7 +141,7 @@ private Block block(Transaction... transactions) {
 
     private Transaction transaction(RskAddress sender, int nonce) {
         Transaction transaction = mock(Transaction.class);
-        when(transaction.getSender()).thenReturn(sender);
+        when(transaction.getSender(any(SignatureCache.class))).thenReturn(sender);
         when(transaction.getNonce()).thenReturn(BigIntegers.asUnsignedByteArray(BigInteger.valueOf(nonce)));
         return transaction;
     }
diff --git a/rskj-core/src/test/java/co/rsk/vm/Create2Test.java b/rskj-core/src/test/java/co/rsk/vm/Create2Test.java
index 8abe86ddb65..6e015c67ee9 100644
--- a/rskj-core/src/test/java/co/rsk/vm/Create2Test.java
+++ b/rskj-core/src/test/java/co/rsk/vm/Create2Test.java
@@ -1,5 +1,3 @@
-package co.rsk.vm;
-
 /*
  * This file is part of RskJ
  * Copyright (C) 2017 RSK Labs Ltd.
@@ -17,6 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+package co.rsk.vm;
 
 import co.rsk.config.TestSystemProperties;
 import co.rsk.config.VmConfig;
@@ -29,9 +28,7 @@
 import co.rsk.test.builders.TransactionBuilder;
 import org.bouncycastle.util.Arrays;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
-import org.ethereum.core.Account;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.crypto.Keccak256Helper;
 import org.ethereum.vm.DataWord;
@@ -51,7 +48,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-
 /**
  * Created by Sebastian Sicardi on 22/05/2019.
  */
@@ -62,13 +58,15 @@ class Create2Test {
     private BytecodeCompiler compiler = new BytecodeCompiler();
     private final TestSystemProperties config = new TestSystemProperties();
     private final VmConfig vmConfig = config.getVmConfig();
+    private final SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
     private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(
             config,
             new BridgeSupportFactory(
                     new RepositoryBtcBlockStoreWithCache.Factory(
                             config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                     config.getNetworkConstants().getBridgeConstants(),
-                    config.getActivationConfig()));
+                    config.getActivationConfig(), signatureCache),
+                    signatureCache);
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
     private final Transaction transaction = createTransaction();
 
@@ -412,7 +410,7 @@ private Program executeCode(String stringCode) {
         byte[] code = compiler.compile(stringCode);
         VM vm = new VM(vmConfig,precompiledContracts);
 
-        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activationConfig, code, invoke, transaction, new HashSet<>());
+        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activationConfig, code, invoke, transaction, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         while (!program.isStopped()){
             vm.step(program);
diff --git a/rskj-core/src/test/java/co/rsk/vm/ExtCodeHashTest.java b/rskj-core/src/test/java/co/rsk/vm/ExtCodeHashTest.java
index 3a0eb2ad661..78b3b5d2101 100644
--- a/rskj-core/src/test/java/co/rsk/vm/ExtCodeHashTest.java
+++ b/rskj-core/src/test/java/co/rsk/vm/ExtCodeHashTest.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of RskJ
+ * Copyright (C) 2017 RSK Labs Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package co.rsk.vm;
 
 import co.rsk.config.TestSystemProperties;
@@ -7,9 +24,7 @@
 import co.rsk.test.builders.AccountBuilder;
 import co.rsk.test.builders.TransactionBuilder;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
-import org.ethereum.core.Account;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.Keccak256Helper;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.DataWord;
@@ -36,13 +51,14 @@ class ExtCodeHashTest {
     private BytecodeCompiler compiler = new BytecodeCompiler();
     private final TestSystemProperties config = new TestSystemProperties();
     private final VmConfig vmConfig = config.getVmConfig();
+    private final SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
     private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(
             config,
             new BridgeSupportFactory(
                     new RepositoryBtcBlockStoreWithCache.Factory(
                             config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                     config.getNetworkConstants().getBridgeConstants(),
-                    config.getActivationConfig()));
+                    config.getActivationConfig(), signatureCache), signatureCache);
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
     private final Transaction transaction = createTransaction();
 
@@ -93,7 +109,7 @@ void testDoEXTCODEHASHWithoutArguments() {
         byte[] code = compiler.compile(stringCode);
         VM vm = new VM(vmConfig, precompiledContracts);
 
-        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activationConfig, code, invoke, transaction, new HashSet<>());
+        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activationConfig, code, invoke, transaction, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         try {
             while (!program.isStopped()) {
                 vm.step(program);
@@ -111,7 +127,7 @@ private void executeExtCodeHash(String destAddress, int gasExpected, byte[] code
         byte[] code = compiler.compile(stringCode);
         VM vm = new VM(vmConfig, precompiledContracts);
 
-        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activationConfig, code, invoke, transaction, new HashSet<>());
+        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activationConfig, code, invoke, transaction, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         while (!program.isStopped()) {
             vm.step(program);
diff --git a/rskj-core/src/test/java/co/rsk/vm/MinerHelper.java b/rskj-core/src/test/java/co/rsk/vm/MinerHelper.java
index 4be8cc7ab86..bc786fceae1 100644
--- a/rskj-core/src/test/java/co/rsk/vm/MinerHelper.java
+++ b/rskj-core/src/test/java/co/rsk/vm/MinerHelper.java
@@ -57,6 +57,7 @@ public class MinerHelper {
     private long totalGasUsed;
     private Coin totalPaidFees = Coin.ZERO;
     private List<TransactionReceipt> txReceipts;
+    private SignatureCache signatureCache;
 
     public MinerHelper(Repository repository, RepositoryLocator repositoryLocator, Blockchain blockchain) {
         this.repository = repository;
@@ -64,6 +65,7 @@ public MinerHelper(Repository repository, RepositoryLocator repositoryLocator, B
         this.blockchain = blockchain;
         this.gasLimitCalculator = new GasLimitCalculator(config.getNetworkConstants());
         this.blockFactory = new BlockFactory(config.getActivationConfig());
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
     }
 
     public void processBlock( Block block, Block parent) {
@@ -90,7 +92,7 @@ public void processBlock( Block block, Block parent) {
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                 config.getNetworkConstants().getBridgeConstants(),
-                config.getActivationConfig());
+                config.getActivationConfig(), signatureCache);
 
         BlockTxSignatureCache blockTxSignatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
 
@@ -101,7 +103,7 @@ public void processBlock( Block block, Block parent) {
                     null,
                     blockFactory,
                     null,
-                    new PrecompiledContracts(config, bridgeSupportFactory), blockTxSignatureCache);
+                    new PrecompiledContracts(config, bridgeSupportFactory, signatureCache), blockTxSignatureCache);
             TransactionExecutor executor = transactionExecutorFactory
                     .newInstance(tx, txindex++, block.getCoinbase(), track, block, totalGasUsed);
 
diff --git a/rskj-core/src/test/java/co/rsk/vm/VMExecutionTest.java b/rskj-core/src/test/java/co/rsk/vm/VMExecutionTest.java
index f1bfa547bb9..2a7f20b1ef8 100644
--- a/rskj-core/src/test/java/co/rsk/vm/VMExecutionTest.java
+++ b/rskj-core/src/test/java/co/rsk/vm/VMExecutionTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.vm;
 
 import co.rsk.config.TestSystemProperties;
@@ -25,6 +24,8 @@
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.core.BlockFactory;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.*;
@@ -50,7 +51,7 @@
  */
 class VMExecutionTest {
     private final TestSystemProperties config = new TestSystemProperties();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
     private VmConfig vmConfig = config.getVmConfig();
     private ProgramInvokeMockImpl invoke;
@@ -607,7 +608,7 @@ void invalidTooFarJump() {
     @Test
     void dupnArgumentIsNotJumpdest() {
         byte[] code = compiler.compile("JUMPDEST DUPN 0x5b 0x5b");
-        Program program = new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), code, invoke, null, new HashSet<>());
+        Program program = new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), code, invoke, null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         BitSet jumpdestSet = program.getJumpdestSet();
 
@@ -622,7 +623,7 @@ void dupnArgumentIsNotJumpdest() {
     @Test
     void swapnArgumentIsNotJumpdest() {
         byte[] code = compiler.compile("JUMPDEST SWAPN 0x5b 0x5b");
-        Program program = new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), code, invoke, null, new HashSet<>());
+        Program program = new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), code, invoke, null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         BitSet jumpdestSet = program.getJumpdestSet();
 
@@ -871,7 +872,7 @@ private Program executeCodeWithActivationConfig(String code, int nsteps, Activat
 
     private Program executeCodeWithActivationConfig(byte[] code, int nsteps, ActivationConfig.ForBlock activations) {
         VM vm = new VM(vmConfig, precompiledContracts);
-        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activations, code, invoke,null, new HashSet<>());
+        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activations, code, invoke,null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         for (int k = 0; k < nsteps; k++) {
             vm.step(program);
@@ -886,7 +887,7 @@ private Program playCodeWithActivationConfig(String code, ActivationConfig.ForBl
 
     private Program playCodeWithActivationConfig(byte[] code, ActivationConfig.ForBlock activations) {
         VM vm = new VM(vmConfig, precompiledContracts);
-        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activations, code, invoke,null, new HashSet<>());
+        Program program = new Program(vmConfig, precompiledContracts, blockFactory, activations, code, invoke,null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         vm.play(program);
 
diff --git a/rskj-core/src/test/java/co/rsk/vm/VMPerformanceTest.java b/rskj-core/src/test/java/co/rsk/vm/VMPerformanceTest.java
index 17ac6c70be0..8a904aa3a8e 100644
--- a/rskj-core/src/test/java/co/rsk/vm/VMPerformanceTest.java
+++ b/rskj-core/src/test/java/co/rsk/vm/VMPerformanceTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package co.rsk.vm;
 
 import co.rsk.config.TestSystemProperties;
@@ -25,6 +24,9 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
 import org.ethereum.core.BlockFactory;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.OpCode;
@@ -61,7 +63,8 @@ public class VMPerformanceTest {
     private final TestSystemProperties config = new TestSystemProperties();
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
     private final VmConfig vmConfig = config.getVmConfig();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, signatureCache);
     private final ActivationConfig.ForBlock activations = ActivationConfigsForTest.all().forBlock(0);
 
     private ProgramInvokeMockImpl invoke;
@@ -123,7 +126,7 @@ private void testVMPerformance1(ResultLogger resultLogger) {
 
         Boolean old = thread.isThreadCpuTimeEnabled();
         thread.setThreadCpuTimeEnabled(true);
-        vm = new VM(config.getVmConfig(), new PrecompiledContracts(config, null));
+        vm = new VM(config.getVmConfig(), new PrecompiledContracts(config, null, signatureCache));
         if (useProfiler)
             waitForProfiler();
 
@@ -264,7 +267,7 @@ public long measureProgram(String opcode, byte[] code, int insCount, int divisor
 
         byte[] newCode = getClonedCode(code,cloneCount);
 
-        program = new Program(vmConfig, precompiledContracts, blockFactory, activations, newCode, invoke, null, new HashSet<>());
+        program = new Program(vmConfig, precompiledContracts, blockFactory, activations, newCode, invoke, null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         int sa = program.getStartAddr();
 
         long myLoops = maxLoops / cloneCount;
@@ -465,7 +468,7 @@ function fib() returns (uint r) {
 } // contract
         */
 
-        vm = new VM(config.getVmConfig(), new PrecompiledContracts(config, null));
+        vm = new VM(config.getVmConfig(), new PrecompiledContracts(config, null, signatureCache));
         // Strip the first 16 bytes which are added by Solidity to store the contract.
         byte[] codePlusPrefix = Hex.decode(
                 //---------------------------------------------------------------------------------------------------------------------nn
@@ -492,7 +495,7 @@ function fib() returns (uint r) {
         ------------------------------------------------------------------------------------------------------------------------------------------------------*/
         byte[] code = Arrays.copyOfRange(codePlusPrefix,16,codePlusPrefix.length);
 
-        program =new Program(vmConfig, precompiledContracts, blockFactory, activations, code, invoke, null, new HashSet<>());
+        program =new Program(vmConfig, precompiledContracts, blockFactory, activations, code, invoke, null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         //String s_expected_1 = "000000000000000000000000000000000000000000000000000000033FFC1244"; // 55
         //String s_expected_1 = "00000000000000000000000000000000000000000000000000000002EE333961";// 50
@@ -551,7 +554,7 @@ void testFibonacciLongTime() {
          }
          } // contract
          ********************************************************************************************/
-        vm = new VM(config.getVmConfig(), new PrecompiledContracts(config, null));
+        vm = new VM(config.getVmConfig(), new PrecompiledContracts(config, null, signatureCache));
         /////////////////////////////////////////////////////////////////////////////////////////////////
         // To increase precesion of the measurement, the maximum k value was increased
         // until the contract took more than 30 seconds
@@ -603,7 +606,7 @@ void testFibonacciLongTime() {
     -----------------------------------------------------------------------------*/
 
     void testRunTime(byte[] code, String s_expected) {
-        program = new Program(vmConfig, precompiledContracts, blockFactory, activations, code, invoke, null, new HashSet<>());
+        program = new Program(vmConfig, precompiledContracts, blockFactory, activations, code, invoke, null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         System.out.println("-----------------------------------------------------------------------------");
         System.out.println("Starting test....");
         startMeasure();
diff --git a/rskj-core/src/test/java/co/rsk/vm/VMSpecificOpcodesPerformanceTest.java b/rskj-core/src/test/java/co/rsk/vm/VMSpecificOpcodesPerformanceTest.java
index 6746193bdb4..2c1d92d1449 100644
--- a/rskj-core/src/test/java/co/rsk/vm/VMSpecificOpcodesPerformanceTest.java
+++ b/rskj-core/src/test/java/co/rsk/vm/VMSpecificOpcodesPerformanceTest.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of RskJ
+ * Copyright (C) 2017 RSK Labs Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package co.rsk.vm;
 
 import co.rsk.config.TestSystemProperties;
@@ -11,9 +28,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Account;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.vm.PrecompiledContracts;
 import org.ethereum.vm.VM;
 import org.ethereum.vm.program.Program;
@@ -41,7 +56,7 @@ class VMSpecificOpcodesPerformanceTest {
     private final TestSystemProperties config = new TestSystemProperties();
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
     private final VmConfig vmConfig = config.getVmConfig();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
     public static String padZeroesLeft(String s, int n) {
         return StringUtils.leftPad(s, n, '0');
@@ -183,7 +198,7 @@ void printResults(Stopwatch stopWatch, int gasCostPerCALLLoop) {
     }
 
     private Program getProgram(byte[] code, Transaction transaction) {
-        return new Program(vmConfig, precompiledContracts, blockFactory, getBlockchainConfig(), code, invoke, transaction, new HashSet<>());
+        return new Program(vmConfig, precompiledContracts, blockFactory, getBlockchainConfig(), code, invoke, transaction, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     }
 
     private byte[] compile(String code) {
diff --git a/rskj-core/src/test/java/co/rsk/vm/precompiles/PrecompiledContractAddressTests.java b/rskj-core/src/test/java/co/rsk/vm/precompiles/PrecompiledContractAddressTests.java
index 38f7c8a6869..42db2681864 100644
--- a/rskj-core/src/test/java/co/rsk/vm/precompiles/PrecompiledContractAddressTests.java
+++ b/rskj-core/src/test/java/co/rsk/vm/precompiles/PrecompiledContractAddressTests.java
@@ -22,6 +22,8 @@
 import co.rsk.core.RskAddress;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.PrecompiledContracts;
 import org.junit.jupiter.api.Assertions;
@@ -49,7 +51,8 @@ class PrecompiledContractAddressTests {
 
     @Test
     void testGetPrecompile() {
-        PrecompiledContracts pcList = new PrecompiledContracts(config, null);
+        PrecompiledContracts pcList = new PrecompiledContracts(config, null,
+                new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         checkAddr(pcList,ECRECOVER_ADDR, "ECRecover");
         checkAddr(pcList,SHA256_ADDR, "Sha256");
         checkAddr(pcList,RIPEMPD160_ADDR ,"Ripempd160");
diff --git a/rskj-core/src/test/java/co/rsk/vm/precompiles/PrecompiledContractTest.java b/rskj-core/src/test/java/co/rsk/vm/precompiles/PrecompiledContractTest.java
index 083bc63998e..1c5b7d5ba8f 100644
--- a/rskj-core/src/test/java/co/rsk/vm/precompiles/PrecompiledContractTest.java
+++ b/rskj-core/src/test/java/co/rsk/vm/precompiles/PrecompiledContractTest.java
@@ -24,6 +24,8 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
 import co.rsk.pcc.bto.HDWalletUtils;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.PrecompiledContracts;
 import org.ethereum.vm.PrecompiledContracts.PrecompiledContract;
@@ -36,7 +38,7 @@
 class PrecompiledContractTest {
 
     private final TestSystemProperties config = new TestSystemProperties();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
     @Test
     void getBridgeContract() {
diff --git a/rskj-core/src/test/java/org/ethereum/core/TransactionExecutorTest.java b/rskj-core/src/test/java/org/ethereum/core/TransactionExecutorTest.java
index e7e9a9c2aaf..da2f1414d7c 100644
--- a/rskj-core/src/test/java/org/ethereum/core/TransactionExecutorTest.java
+++ b/rskj-core/src/test/java/org/ethereum/core/TransactionExecutorTest.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of RskJ
+ * Copyright (C) 2017 RSK Labs Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.ethereum.core;
 
 import co.rsk.config.VmConfig;
@@ -94,7 +111,7 @@ void testInitHandlesFreeTransactionsOK() {
         // but is sending some nice value over the wire
         when(transaction.getValue()).thenReturn(new Coin(BigInteger.valueOf(68000)));
         // note that the transaction is free of cost
-        assertEquals(0, transaction.transactionCost(constants, activationConfig.forBlock(executionBlock.getNumber())));
+        assertEquals(0, transaction.transactionCost(constants, activationConfig.forBlock(executionBlock.getNumber()), new BlockTxSignatureCache(new ReceivedTxSignatureCache())));
         assertFalse(txExecutor.executeTransaction());
     }
 
@@ -184,7 +201,7 @@ void InvalidTxsIsInBlockAndShouldntBeInCache(){
                 blockTxSignatureCache
         );
 
-        assertEquals(0, transaction.transactionCost(constants, activationConfig.forBlock(executionBlock.getNumber())));
+        assertEquals(0, transaction.transactionCost(constants, activationConfig.forBlock(executionBlock.getNumber()), new BlockTxSignatureCache(new ReceivedTxSignatureCache())));
         assertFalse(txExecutor.executeTransaction());
         assertNotNull(blockTxSignatureCache.getSender(transaction));
     }
@@ -217,7 +234,7 @@ void remascTxIsReceivedAndShouldntBeInCache(){
                 blockTxSignatureCache
         );
 
-        assertEquals(0, transaction.transactionCost(constants, activationConfig.forBlock(executionBlock.getNumber())));
+        assertEquals(0, transaction.transactionCost(constants, activationConfig.forBlock(executionBlock.getNumber()), new BlockTxSignatureCache(new ReceivedTxSignatureCache())));
         assertFalse(txExecutor.executeTransaction());
         assertNotNull(blockTxSignatureCache.getSender(transaction));
     }
diff --git a/rskj-core/src/test/java/org/ethereum/core/TransactionSetTest.java b/rskj-core/src/test/java/org/ethereum/core/TransactionSetTest.java
index ee2b979e1f8..902bcdacabd 100644
--- a/rskj-core/src/test/java/org/ethereum/core/TransactionSetTest.java
+++ b/rskj-core/src/test/java/org/ethereum/core/TransactionSetTest.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.core;
 
 import co.rsk.core.RskAddress;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -30,9 +30,16 @@
  * Created by ajlopez on 28/02/2018.
  */
 class TransactionSetTest {
+
+    private SignatureCache signatureCache;
+
+    @BeforeEach
+    public void setup() {
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+    }
     @Test
     void getEmptyTransactionList() {
-        TransactionSet txset = new TransactionSet();
+        TransactionSet txset = new TransactionSet(signatureCache);
 
         List<Transaction> result = txset.getTransactions();
 
@@ -42,7 +49,7 @@ void getEmptyTransactionList() {
 
     @Test
     void transactionIsNotInEmptySet() {
-        TransactionSet txset = new TransactionSet();
+        TransactionSet txset = new TransactionSet(signatureCache);
         Transaction transaction = createSampleTransaction();
 
         Assertions.assertFalse(txset.hasTransaction(transaction));
@@ -54,7 +61,7 @@ void transactionIsNotInEmptySet() {
 
     @Test
     void hasTransaction() {
-        TransactionSet txset = new TransactionSet();
+        TransactionSet txset = new TransactionSet(signatureCache);
         Transaction transaction1 = createSampleTransaction(10);
         Transaction transaction2 = createSampleTransaction(20);
         Transaction transaction3 = createSampleTransaction(30);
@@ -69,7 +76,7 @@ void hasTransaction() {
 
     @Test
     void addAndRemoveTransactions() {
-        TransactionSet txset = new TransactionSet();
+        TransactionSet txset = new TransactionSet(signatureCache);
 
         Transaction transaction1 = createSampleTransaction(1, 2, 100, 0);
         Transaction transaction2 = createSampleTransaction(2, 3, 200, 0);
@@ -95,7 +102,7 @@ void addAndRemoveTransactions() {
 
     @Test
     void addTransactionAndGetListWithOneTransaction() {
-        TransactionSet txset = new TransactionSet();
+        TransactionSet txset = new TransactionSet(signatureCache);
         Transaction tx = createSampleTransaction();
 
         txset.addTransaction(tx);
@@ -110,7 +117,7 @@ void addTransactionAndGetListWithOneTransaction() {
 
     @Test
     void addtTransactionTwiceAndGetListWithOneTransaction() {
-        TransactionSet txset = new TransactionSet();
+        TransactionSet txset = new TransactionSet(signatureCache);
         Transaction transaction = createSampleTransaction();
 
         txset.addTransaction(transaction);
@@ -126,7 +133,7 @@ void addtTransactionTwiceAndGetListWithOneTransaction() {
 
     @Test
     void getEmptyTransactionListByUnknownSender() {
-        TransactionSet txset = new TransactionSet();
+        TransactionSet txset = new TransactionSet(signatureCache);
 
         List<Transaction> result = txset.getTransactionsWithSender(new RskAddress(new byte[20]));
 
@@ -136,7 +143,7 @@ void getEmptyTransactionListByUnknownSender() {
 
     @Test
     void addTransactionAndGetListBySenderWithOneTransaction() {
-        TransactionSet txset = new TransactionSet();
+        TransactionSet txset = new TransactionSet(signatureCache);
         Transaction transaction = createSampleTransaction();
 
         txset.addTransaction(transaction);
@@ -151,7 +158,7 @@ void addTransactionAndGetListBySenderWithOneTransaction() {
 
     @Test
     void addTransactionTwiceAndGetListBySenderWithOneTransaction() {
-        TransactionSet txset = new TransactionSet();
+        TransactionSet txset = new TransactionSet(signatureCache);
         Transaction transaction = createSampleTransaction();
 
         txset.addTransaction(transaction);
diff --git a/rskj-core/src/test/java/org/ethereum/core/TransactionTest.java b/rskj-core/src/test/java/org/ethereum/core/TransactionTest.java
index bf045a0564b..ef7d3ecba56 100644
--- a/rskj-core/src/test/java/org/ethereum/core/TransactionTest.java
+++ b/rskj-core/src/test/java/org/ethereum/core/TransactionTest.java
@@ -487,7 +487,10 @@ protected ProgramResult executeTransaction(Transaction tx) {
                             new RepositoryBtcBlockStoreWithCache.Factory(
                                     config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                             config.getNetworkConstants().getBridgeConstants(),
-                            config.getActivationConfig());
+                            config.getActivationConfig(),
+                            new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
+
+                    BlockTxSignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
 
                     TransactionExecutorFactory transactionExecutorFactory = new TransactionExecutorFactory(
                             config,
@@ -495,8 +498,8 @@ protected ProgramResult executeTransaction(Transaction tx) {
                             null,
                             blockFactory,
                             invokeFactory,
-                            new PrecompiledContracts(config, bridgeSupportFactory),
-                            new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
+                            new PrecompiledContracts(config, bridgeSupportFactory, signatureCache),
+                            signatureCache);
                     TransactionExecutor executor = transactionExecutorFactory
                             .newInstance(txConst, 0, bestBlock.getCoinbase(), track, bestBlock, 0)
                             .setLocalCall(true);
@@ -750,6 +753,7 @@ void verifyTx_noSignature() {
         ECKey ecKey = ECKey.fromPrivate(privKey);
         byte[] gasPrice = Hex.decode("09184e72a000");
         byte[] gas = Hex.decode("4255");
+        SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
 
         Transaction tx = Transaction.builder()
                 .gasPrice(gasPrice)
@@ -758,7 +762,7 @@ void verifyTx_noSignature() {
                 .value(value)
                 .build();
         try {
-            tx.verify();
+            tx.verify(signatureCache);
         } catch (Exception e) {
             fail(e.getMessage());
         }
@@ -772,6 +776,7 @@ void verifyTx_withSignature() {
         ECKey ecKey = ECKey.fromPrivate(privKey);
         byte[] gasPrice = Hex.decode("09184e72a000");
         byte[] gas = Hex.decode("4255");
+        SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
 
         Transaction tx = Transaction.builder()
                 .gasPrice(gasPrice)
@@ -781,7 +786,7 @@ void verifyTx_withSignature() {
                 .build();
         tx.sign(senderPrivKey);
         try {
-            tx.verify();
+            tx.verify(signatureCache);
         } catch (Exception e) {
             fail(e.getMessage());
         }
@@ -826,11 +831,14 @@ private TransactionExecutor executeTransaction(
             Repository repository,
             BlockTxSignatureCache blockTxSignatureCache) {
         Repository track = repository.startTracking();
+
+        SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+
         BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
                 new RepositoryBtcBlockStoreWithCache.Factory(
                         config.getNetworkConstants().getBridgeConstants().getBtcParams()),
                 config.getNetworkConstants().getBridgeConstants(),
-                config.getActivationConfig());
+                config.getActivationConfig(), signatureCache);
 
         TransactionExecutorFactory transactionExecutorFactory = new TransactionExecutorFactory(
                 config,
@@ -838,7 +846,7 @@ private TransactionExecutor executeTransaction(
                 null,
                 blockFactory,
                 new ProgramInvokeFactoryImpl(),
-                new PrecompiledContracts(config, bridgeSupportFactory),
+                new PrecompiledContracts(config, bridgeSupportFactory, signatureCache),
                 blockTxSignatureCache);
         TransactionExecutor executor = transactionExecutorFactory
                 .newInstance(tx, 0, RskAddress.nullAddress(), repository, blockchain.getBestBlock(), 0);
diff --git a/rskj-core/src/test/java/org/ethereum/jsontestsuite/TestProgramInvokeFactory.java b/rskj-core/src/test/java/org/ethereum/jsontestsuite/TestProgramInvokeFactory.java
index 73510a8dce2..e19db998bad 100644
--- a/rskj-core/src/test/java/org/ethereum/jsontestsuite/TestProgramInvokeFactory.java
+++ b/rskj-core/src/test/java/org/ethereum/jsontestsuite/TestProgramInvokeFactory.java
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.jsontestsuite;
 
 import co.rsk.core.Coin;
 import co.rsk.core.RskAddress;
 import org.ethereum.core.Block;
 import org.ethereum.core.Repository;
+import org.ethereum.core.SignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.db.BlockStore;
 import org.ethereum.util.ByteUtil;
@@ -46,8 +46,8 @@ public TestProgramInvokeFactory(Env env) {
 
 
     @Override
-    public ProgramInvoke createProgramInvoke(Transaction tx, int txindex, Block block, Repository repository, BlockStore blockStore) {
-        return generalInvoke(tx, txindex, repository, blockStore);
+    public ProgramInvoke createProgramInvoke(Transaction tx, int txindex, Block block, Repository repository, BlockStore blockStore, SignatureCache signatureCache) {
+        return generalInvoke(tx, txindex, repository, blockStore, signatureCache);
     }
 
     @Override
@@ -59,7 +59,7 @@ public ProgramInvoke createProgramInvoke(Program program, DataWord toAddress, Da
         return null;
     }
 
-    private ProgramInvoke generalInvoke(Transaction tx, int txindex, Repository repository, BlockStore blockStore) {
+    private ProgramInvoke generalInvoke(Transaction tx, int txindex, Repository repository, BlockStore blockStore, SignatureCache signatureCache) {
 
         /***         ADDRESS op       ***/
         // YP: Get address of currently executing account.
@@ -67,11 +67,11 @@ private ProgramInvoke generalInvoke(Transaction tx, int txindex, Repository repo
 
         /***         ORIGIN op       ***/
         // YP: This is the sender of original transaction; it is never a contract.
-        RskAddress origin = tx.getSender();
+        RskAddress origin = tx.getSender(signatureCache);
 
         /***         CALLER op       ***/
         // YP: This is the address of the account that is directly responsible for this execution.
-        RskAddress caller = tx.getSender();
+        RskAddress caller = tx.getSender(signatureCache);
 
         /***         BALANCE op       ***/
         Coin balance = repository.getBalance(addr);
diff --git a/rskj-core/src/test/java/org/ethereum/jsontestsuite/TestRunner.java b/rskj-core/src/test/java/org/ethereum/jsontestsuite/TestRunner.java
index 0b53e529f04..a65a2e95971 100644
--- a/rskj-core/src/test/java/org/ethereum/jsontestsuite/TestRunner.java
+++ b/rskj-core/src/test/java/org/ethereum/jsontestsuite/TestRunner.java
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.jsontestsuite;
 
 import co.rsk.config.TestSystemProperties;
@@ -86,7 +85,7 @@ public class TestRunner {
 
     private final TestSystemProperties config = new TestSystemProperties();
     private final VmConfig vmConfig = config.getVmConfig();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
     private Logger logger = LoggerFactory.getLogger("TCK-Test");
     private ProgramTrace trace = null;
@@ -282,7 +281,7 @@ public List<String> runTestCase(TestCase testCase) {
             /* 3. Create Program - exec.code */
             /* 4. run VM */
             VM vm = new VM(vmConfig, precompiledContracts);
-            Program program = new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), exec.getCode(), programInvoke, null, new HashSet<>());
+            Program program = new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), exec.getCode(), programInvoke, null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
             boolean vmDidThrowAnEception = false;
             Exception e = null;
             ThreadMXBean thread;
diff --git a/rskj-core/src/test/java/org/ethereum/jsontestsuite/runners/StateTestRunner.java b/rskj-core/src/test/java/org/ethereum/jsontestsuite/runners/StateTestRunner.java
index 078b3b85d99..c8a6022eec7 100644
--- a/rskj-core/src/test/java/org/ethereum/jsontestsuite/runners/StateTestRunner.java
+++ b/rskj-core/src/test/java/org/ethereum/jsontestsuite/runners/StateTestRunner.java
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.jsontestsuite.runners;
 
 import co.rsk.config.BridgeRegTestConstants;
@@ -73,8 +72,7 @@ public class StateTestRunner {
             config.getNetworkConstants().bridgeConstants.getBtcParams()
     );
 
-    private final BridgeSupportFactory bridgeSupportFactory = new BridgeSupportFactory(
-           blockStoreWithCache, BridgeRegTestConstants.getInstance(), config.getActivationConfig());
+    private final BridgeSupportFactory bridgeSupportFactory;
 
     public static List<String> run(StateTestCase stateTestCase2) {
         return new StateTestRunner(stateTestCase2).runImpl();
@@ -90,11 +88,15 @@ public static List<String> run(StateTestCase stateTestCase2) {
     protected Block block;
     protected ValidationStats vStats;
     protected PrecompiledContracts precompiledContracts;
+    protected SignatureCache signatureCache;
 
     public StateTestRunner(StateTestCase stateTestCase) {
         this.stateTestCase = stateTestCase;
+        this.signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+        this.bridgeSupportFactory = new BridgeSupportFactory(
+                blockStoreWithCache, BridgeRegTestConstants.getInstance(), config.getActivationConfig(), signatureCache);
         setstateTestUSeREMASC(false);
-        precompiledContracts = new PrecompiledContracts(config, bridgeSupportFactory);
+        precompiledContracts = new PrecompiledContracts(config, bridgeSupportFactory, signatureCache);
     }
 
     public StateTestRunner setstateTestUSeREMASC(boolean v) {
diff --git a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplLogsTest.java b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplLogsTest.java
index 466abd6676f..6db46cc48f4 100644
--- a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplLogsTest.java
+++ b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplLogsTest.java
@@ -27,13 +27,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.ethereum.core.Account;
-import org.ethereum.core.Block;
-import org.ethereum.core.Blockchain;
-import org.ethereum.core.CallTransaction;
-import org.ethereum.core.ImportResult;
-import org.ethereum.core.Transaction;
-import org.ethereum.core.TransactionPool;
+import org.ethereum.core.*;
 import org.ethereum.datasource.HashMapDB;
 import org.ethereum.db.BlockStore;
 import org.ethereum.db.ReceiptStore;
@@ -119,6 +113,8 @@ class Web3ImplLogsTest {
     private TrieStore trieStore;
     private BlockStore blockStore;
 
+    private SignatureCache signatureCache;
+
     //20965255 getValue()
     //371303c0 inc()
 
@@ -134,6 +130,7 @@ void setUp() {
         eth = factory.getRsk();
         receiptStore = factory.getReceiptStore();
         web3 = createWeb3();
+        signatureCache = new ReceivedTxSignatureCache();
     }
 
     @Test
@@ -1071,10 +1068,10 @@ private Web3Impl createWeb3() {
                 null, new ExecutionBlockRetriever(blockChain, null, null),
                 null, new EthModuleWalletEnabled(wallet), null,
                 new BridgeSupportFactory(
-                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig()),
+                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig(), new BlockTxSignatureCache(new ReceivedTxSignatureCache())),
                 config.getGasEstimationCap()
         );
-        TxPoolModule txPoolModule = new TxPoolModuleImpl(transactionPool);
+        TxPoolModule txPoolModule = new TxPoolModuleImpl(transactionPool, signatureCache);
         DebugModule debugModule = new DebugModuleImpl(null, null, Web3Mocks.getMockMessageHandler(), null, null);
         return new Web3RskImpl(
                 eth,
@@ -1101,6 +1098,7 @@ null, new EthModuleWalletEnabled(wallet), null,
                 null,
                 new BlocksBloomStore(2, 0, new HashMapDB()),
                 mock(Web3InformationRetriever.class),
+                null,
                 null);
     }
 
diff --git a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplScoringTest.java b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplScoringTest.java
index 917d43b16ba..a33a4cd87e5 100644
--- a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplScoringTest.java
+++ b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplScoringTest.java
@@ -38,6 +38,8 @@
 import co.rsk.scoring.*;
 import co.rsk.test.World;
 import org.ethereum.TestUtils;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.rpc.Simples.SimpleEthereum;
 import org.ethereum.rpc.exception.RskJsonRpcRequestException;
 import org.ethereum.util.ByteUtil;
@@ -407,10 +409,10 @@ private static Web3Impl createWeb3(PeerScoringManager peerScoringManager) {
                 null, new ExecutionBlockRetriever(world.getBlockChain(), null, null),
                 null, new EthModuleWalletEnabled(wallet), null,
                 new BridgeSupportFactory(
-                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig()),
+                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig(), new BlockTxSignatureCache(new ReceivedTxSignatureCache())),
                 config.getGasEstimationCap()
         );
-        TxPoolModule tpm = new TxPoolModuleImpl(Web3Mocks.getMockTransactionPool());
+        TxPoolModule tpm = new TxPoolModuleImpl(Web3Mocks.getMockTransactionPool(), new ReceivedTxSignatureCache());
         DebugModule dm = new DebugModuleImpl(null, null, Web3Mocks.getMockMessageHandler(), null, null);
         return new Web3RskImpl(
                 rsk,
@@ -437,6 +439,7 @@ null, new EthModuleWalletEnabled(wallet), null,
                 null,
                 null,
                 null,
+                null,
                 null);
     }
 
diff --git a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplSnapshotTest.java b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplSnapshotTest.java
index 3ccc84b9b89..6708c7c75de 100644
--- a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplSnapshotTest.java
+++ b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplSnapshotTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.rpc;
 
 import co.rsk.blockchain.utils.BlockGenerator;
@@ -38,9 +37,7 @@
 import co.rsk.rpc.modules.txpool.TxPoolModuleImpl;
 import co.rsk.validators.BlockValidationRule;
 import co.rsk.validators.ProofOfWorkRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Blockchain;
+import org.ethereum.core.*;
 import org.ethereum.rpc.Simples.SimpleEthereum;
 import org.ethereum.util.BuildInfo;
 import org.ethereum.util.RskTestFactory;
@@ -51,8 +48,6 @@
 import java.time.Clock;
 import java.util.List;
 
-import static org.mockito.Mockito.mock;
-
 /**
  * Created by ajlopez on 15/04/2017.
  */
@@ -172,7 +167,7 @@ private Web3Impl createWeb3(SimpleEthereum ethereum) {
                                                 )
         );
         PersonalModule pm = new PersonalModuleWalletDisabled();
-        TxPoolModule tpm = new TxPoolModuleImpl(Web3Mocks.getMockTransactionPool());
+        TxPoolModule tpm = new TxPoolModuleImpl(Web3Mocks.getMockTransactionPool(), new ReceivedTxSignatureCache());
         DebugModule dm = new DebugModuleImpl(null, null, Web3Mocks.getMockMessageHandler(), null, null);
 
         ethereum.blockchain = blockchain;
@@ -201,6 +196,7 @@ private Web3Impl createWeb3(SimpleEthereum ethereum) {
                 null,
                 null,
                 null,
+                null,
                 null);
     }
 
@@ -233,7 +229,8 @@ private MinerServer getMinerServerForTest(SimpleEthereum ethereum, MinerClock cl
                         blockFactory,
                         factory.getBlockExecutor(),
                         new MinimumGasPriceCalculator(Coin.valueOf(miningConfig.getMinGasPriceTarget())),
-                        new MinerUtils()
+                        new MinerUtils(),
+                        new BlockTxSignatureCache(new ReceivedTxSignatureCache())
                 ),
                 clock,
                 blockFactory,
diff --git a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplTest.java b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplTest.java
index 46848363cfb..2ac438a1fe9 100644
--- a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplTest.java
+++ b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplTest.java
@@ -84,6 +84,7 @@
 import org.ethereum.vm.program.invoke.ProgramInvokeFactoryImpl;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
@@ -112,6 +113,13 @@ class Web3ImplTest {
 
     private Wallet wallet;
 
+    private SignatureCache signatureCache;
+
+    @BeforeEach
+    public void setup() {
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+    }
+
     @Test
     void web3_clientVersion() {
         Web3 web3 = createWeb3();
@@ -646,7 +654,7 @@ void eth_mining() {
         RskSystemProperties mockProperties = Web3Mocks.getMockProperties();
         MinerClient minerClient = new SimpleMinerClient();
         PersonalModule personalModule = new PersonalModuleWalletDisabled();
-        TxPoolModule txPoolModule = new TxPoolModuleImpl(Web3Mocks.getMockTransactionPool());
+        TxPoolModule txPoolModule = new TxPoolModuleImpl(Web3Mocks.getMockTransactionPool(), signatureCache);
         DebugModule debugModule = new DebugModuleImpl(null, null, Web3Mocks.getMockMessageHandler(), null, null);
         Web3 web3 = new Web3Impl(
                 ethMock,
@@ -672,7 +680,8 @@ void eth_mining() {
                 null,
                 null,
                 mock(Web3InformationRetriever.class),
-                null);
+                null,
+                signatureCache);
 
         assertFalse(web3.eth_mining(), "Node is not mining");
         try {
@@ -1884,7 +1893,8 @@ void eth_coinbase() {
                 null,
                 null,
                 mock(Web3InformationRetriever.class),
-                null);
+                null,
+                signatureCache);
 
         assertEquals("0x" + originalCoinbase, web3.eth_coinbase());
         verify(minerServerMock, times(1)).getCoinbaseAddress();
@@ -2165,7 +2175,7 @@ void lockAccount() {
     private Web3Impl createWeb3() {
         return createWeb3(
                 Web3Mocks.getMockEthereum(), Web3Mocks.getMockBlockchain(), Web3Mocks.getMockRepositoryLocator(), Web3Mocks.getMockTransactionPool(),
-                Web3Mocks.getMockBlockStore(), null, null, null
+                Web3Mocks.getMockBlockStore(), null, null, null, signatureCache
         );
     }
 
@@ -2345,10 +2355,10 @@ private Web3Impl createWeb3(SimpleEthereum eth, PeerServer peerServer) {
                 null, new ExecutionBlockRetriever(blockchain, null, null),
                 null, new EthModuleWalletEnabled(wallet), null,
                 new BridgeSupportFactory(
-                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig()),
+                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig(), signatureCache),
                 config.getGasEstimationCap()
         );
-        TxPoolModule txPoolModule = new TxPoolModuleImpl(Web3Mocks.getMockTransactionPool());
+        TxPoolModule txPoolModule = new TxPoolModuleImpl(Web3Mocks.getMockTransactionPool(), signatureCache);
         DebugModule debugModule = new DebugModuleImpl(null, null, Web3Mocks.getMockMessageHandler(), null, null);
         MinerClient minerClient = new SimpleMinerClient();
         ChannelManager channelManager = new SimpleChannelManager();
@@ -2381,6 +2391,7 @@ null, new EthModuleWalletEnabled(wallet), null,
                         blockchain,
                         mock(RepositoryLocator.class),
                         mock(ExecutionBlockRetriever.class)),
+                null,
                 null);
     }
 
@@ -2404,7 +2415,7 @@ private Web3Impl createWeb3(Ethereum eth, World world, TransactionPool transacti
         RepositoryLocator repositoryLocator = world.getRepositoryLocator();
         return createWeb3(
                 eth, world.getBlockChain(), repositoryLocator, transactionPool, world.getBlockStore(),
-                null, new SimpleConfigCapabilities(), receiptStore
+                null, new SimpleConfigCapabilities(), receiptStore, signatureCache
         );
     }
 
@@ -2412,7 +2423,7 @@ private Web3Impl createWeb3CallNoReturn(Ethereum eth, World world, TransactionPo
         RepositoryLocator repositoryLocator = world.getRepositoryLocator();
         return createWeb3CallNoReturn(
                 eth, world.getBlockChain(), repositoryLocator, transactionPool, world.getBlockStore(),
-                null, new SimpleConfigCapabilities(), receiptStore
+                null, new SimpleConfigCapabilities(), receiptStore, signatureCache
         );
     }
 
@@ -2426,7 +2437,8 @@ private Web3Impl createWeb3(World world, BlockProcessor blockProcessor, ReceiptS
         return createWeb3(
                 Web3Mocks.getMockEthereum(), blockChain, repositoryLocator, transactionPool,
                 blockStore, blockProcessor,
-                new SimpleConfigCapabilities(), receiptStore
+                new SimpleConfigCapabilities(), receiptStore,
+                signatureCache
         );
     }
 
@@ -2438,7 +2450,8 @@ private Web3Impl createWeb3(
             BlockStore blockStore,
             BlockProcessor nodeBlockProcessor,
             ConfigCapabilities configCapabilities,
-            ReceiptStore receiptStore) {
+            ReceiptStore receiptStore,
+            SignatureCache signatureCache) {
         ExecutionBlockRetriever executionBlockRetriever = mock(ExecutionBlockRetriever.class);
         wallet = WalletFactory.createWallet();
         PersonalModuleWalletEnabled personalModule = new PersonalModuleWalletEnabled(config, eth, wallet, transactionPool);
@@ -2455,10 +2468,10 @@ private Web3Impl createWeb3(
                 new ExecutionBlockRetriever(blockchain, null, null), repositoryLocator, new EthModuleWalletEnabled(wallet),
                 new EthModuleTransactionBase(config.getNetworkConstants(), wallet, transactionPool, transactionGateway),
                 new BridgeSupportFactory(
-                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig()),
+                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig(), signatureCache),
                 config.getGasEstimationCap()
         );
-        TxPoolModule txPoolModule = new TxPoolModuleImpl(transactionPool);
+        TxPoolModule txPoolModule = new TxPoolModuleImpl(transactionPool, signatureCache);
         DebugModule debugModule = new DebugModuleImpl(null, null, Web3Mocks.getMockMessageHandler(), null, null);
         RskModule rskModule = new RskModuleImpl(blockchain, blockStore, receiptStore, retriever);
         MinerClient minerClient = new SimpleMinerClient();
@@ -2489,7 +2502,8 @@ private Web3Impl createWeb3(
                 new BuildInfo("test", "test"),
                 null,
                 retriever,
-                syncProcessor
+                syncProcessor,
+                signatureCache
         );
     }
 
@@ -2501,7 +2515,8 @@ private Web3Impl createWeb3CallNoReturn(
             BlockStore blockStore,
             BlockProcessor nodeBlockProcessor,
             ConfigCapabilities configCapabilities,
-            ReceiptStore receiptStore) {
+            ReceiptStore receiptStore,
+            SignatureCache signatureCache) {
         ExecutionBlockRetriever executionBlockRetriever = mock(ExecutionBlockRetriever.class);
         wallet = WalletFactory.createWallet();
         PersonalModuleWalletEnabled personalModule = new PersonalModuleWalletEnabled(config, eth, wallet, transactionPool);
@@ -2516,9 +2531,9 @@ private Web3Impl createWeb3CallNoReturn(
                 new EthModuleWalletEnabled(wallet),
                 new EthModuleTransactionBase(config.getNetworkConstants(), wallet, transactionPool, null),
                 new BridgeSupportFactory(
-                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig()),
+                        null, config.getNetworkConstants().getBridgeConstants(), config.getActivationConfig(), signatureCache),
                 config.getGasEstimationCap());
-        TxPoolModule txPoolModule = new TxPoolModuleImpl(transactionPool);
+        TxPoolModule txPoolModule = new TxPoolModuleImpl(transactionPool, signatureCache);
         DebugModule debugModule = new DebugModuleImpl(null, null, Web3Mocks.getMockMessageHandler(), null, null);
         RskModule rskModule = new RskModuleImpl(blockchain, blockStore, receiptStore, retriever);
         MinerClient minerClient = new SimpleMinerClient();
@@ -2549,7 +2564,8 @@ private Web3Impl createWeb3CallNoReturn(
                 new BuildInfo("test", "test"),
                 null,
                 retriever,
-                null);
+                null,
+                signatureCache);
     }
 
     private TransactionExecutorFactory buildTransactionExecutorFactory(
@@ -2560,7 +2576,7 @@ private TransactionExecutorFactory buildTransactionExecutorFactory(
                 null,
                 blockFactory,
                 new ProgramInvokeFactoryImpl(),
-                new PrecompiledContracts(config, null),
+                new PrecompiledContracts(config, null, signatureCache),
                 blockTxSignatureCache);
     }
 
diff --git a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplUnitTest.java b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplUnitTest.java
index a6d334c781d..752d0d05d5f 100644
--- a/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplUnitTest.java
+++ b/rskj-core/src/test/java/org/ethereum/rpc/Web3ImplUnitTest.java
@@ -17,10 +17,7 @@
 import java.util.Optional;
 
 import org.ethereum.TestUtils;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockHeader;
-import org.ethereum.core.Blockchain;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.db.BlockStore;
 import org.ethereum.db.ReceiptStore;
 import org.ethereum.facade.Ethereum;
@@ -92,7 +89,8 @@ void setup() {
                 mock(BuildInfo.class),
                 mock(BlocksBloomStore.class),
                 retriever,
-                null);
+                null,
+                new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     }
 
     @Test
diff --git a/rskj-core/src/test/java/org/ethereum/rpc/dto/BlockResultDTOTest.java b/rskj-core/src/test/java/org/ethereum/rpc/dto/BlockResultDTOTest.java
index 1aa3bb6bbc0..fbe71730cef 100644
--- a/rskj-core/src/test/java/org/ethereum/rpc/dto/BlockResultDTOTest.java
+++ b/rskj-core/src/test/java/org/ethereum/rpc/dto/BlockResultDTOTest.java
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.rpc.dto;
 
 import co.rsk.core.BlockDifficulty;
@@ -24,9 +23,7 @@
 import co.rsk.test.builders.BlockBuilder;
 import co.rsk.test.builders.TransactionBuilder;
 import co.rsk.util.HexUtils;
-import org.ethereum.core.Block;
-import org.ethereum.core.Blockchain;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.core.genesis.GenesisLoader;
 import org.ethereum.db.BlockStore;
 import org.ethereum.util.RskTestFactory;
@@ -47,14 +44,14 @@
 
 class BlockResultDTOTest {
 
-    private static final String HEX_ZERO = "0x0";
-
     private Block block;
     private BlockStore blockStore;
-    public static final Transaction TRANSACTION = new TransactionBuilder().buildRandomTransaction();
 
     // todo(fedejinich) currently RemascTx(blockNumber) has a bug, thats why I initialize this way
     public static final RemascTransaction REMASC_TRANSACTION = new RemascTransaction(new RemascTransaction(1).getEncoded());
+    public static final Transaction TRANSACTION = new TransactionBuilder().buildRandomTransaction();
+
+    private static final String HEX_ZERO = "0x0";
 
     @BeforeEach
     void setup() {
@@ -65,7 +62,7 @@ void setup() {
 
     @Test
     void getBlockResultDTOWithRemascAndTransactionHashes() {
-        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, false, blockStore, false, false);
+        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, false, blockStore, false, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         List<String> transactionHashes = transactionHashesByBlock(blockResultDTO);
 
         Assertions.assertNotNull(blockResultDTO);
@@ -76,7 +73,7 @@ void getBlockResultDTOWithRemascAndTransactionHashes() {
 
     @Test
     void getBlockResultDTOWithoutRemascAndTransactionHashes() {
-        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, false, blockStore, true, false);
+        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, false, blockStore, true, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         List<String> transactionHashes = transactionHashesByBlock(blockResultDTO);
 
         Assertions.assertNotNull(blockResultDTO);
@@ -88,7 +85,7 @@ void getBlockResultDTOWithoutRemascAndTransactionHashes() {
     @Test
     void getBlockResultDTOWithoutRemasc_emptyTransactions() {
         Block block = buildBlockWithTransactions(Arrays.asList(REMASC_TRANSACTION));
-        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, false, blockStore, true, false);
+        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, false, blockStore, true, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         Assertions.assertEquals(HexUtils.toUnformattedJsonHex(EMPTY_TRIE_HASH), blockResultDTO.getTransactionsRoot());
 
@@ -99,7 +96,7 @@ void getBlockResultDTOWithoutRemasc_emptyTransactions() {
 
     @Test
     void getBlockResultDTOWithNullSignatureRemascAndFullTransactions() {
-        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, true, blockStore, false, false);
+        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, true, blockStore, false, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         Assertions.assertNotNull(blockResultDTO);
         Assertions.assertEquals(2, blockResultDTO.getTransactions().size());
 
@@ -116,7 +113,7 @@ void getBlockResultDTOWithNullSignatureRemascAndFullTransactions() {
 
     @Test
     void getBlockResultDTOWithWithZeroSignatureRemascAndFullTransactions() {
-        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, true, blockStore, false, true);
+        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, true, blockStore, false, true, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         Assertions.assertNotNull(blockResultDTO);
         Assertions.assertEquals(2, blockResultDTO.getTransactions().size());
 
@@ -132,7 +129,7 @@ void getBlockResultDTOWithWithZeroSignatureRemascAndFullTransactions() {
 
     @Test
     void getBlockResultDTOWithoutRemascAndFullTransactions() {
-        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, true, blockStore, true, false);
+        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, true, blockStore, true, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         List<String> transactionResultsHashes = transactionResultsByBlock(blockResultDTO).stream().map(e -> e.getHash()).collect(Collectors.toList());
 
diff --git a/rskj-core/src/test/java/org/ethereum/rpc/dto/TransactionReceiptDTOTest.java b/rskj-core/src/test/java/org/ethereum/rpc/dto/TransactionReceiptDTOTest.java
index 804f8d97771..70ecceea370 100644
--- a/rskj-core/src/test/java/org/ethereum/rpc/dto/TransactionReceiptDTOTest.java
+++ b/rskj-core/src/test/java/org/ethereum/rpc/dto/TransactionReceiptDTOTest.java
@@ -15,15 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.rpc.dto;
 
 import co.rsk.core.RskAddress;
 import co.rsk.crypto.Keccak256;
-import org.ethereum.core.Block;
-import org.ethereum.core.Bloom;
-import org.ethereum.core.Transaction;
-import org.ethereum.core.TransactionReceipt;
+import org.ethereum.core.*;
 import org.ethereum.db.TransactionInfo;
 import org.ethereum.util.ByteUtil;
 import org.junit.jupiter.api.Test;
@@ -32,6 +28,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -48,7 +45,7 @@ void testOkStatusField() {
 
         Transaction transaction = mock(Transaction.class);
         when(transaction.getHash()).thenReturn(hash);
-        when(transaction.getSender()).thenReturn(rskAddress);
+        when(transaction.getSender(any(SignatureCache.class))).thenReturn(rskAddress);
         when(transaction.getReceiveAddress()).thenReturn(rskAddress);
 
         TransactionReceipt txReceipt = mock(TransactionReceipt.class);
@@ -59,7 +56,7 @@ void testOkStatusField() {
 
         TransactionInfo txInfo = new TransactionInfo(txReceipt, hash.getBytes(), 0);
 
-        TransactionReceiptDTO transactionReceiptDTO = new TransactionReceiptDTO(block, txInfo);
+        TransactionReceiptDTO transactionReceiptDTO = new TransactionReceiptDTO(block, txInfo, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         String actualStatus = transactionReceiptDTO.getStatus();
 
@@ -78,7 +75,7 @@ void testErrorStatusField() {
 
         Transaction transaction = mock(Transaction.class);
         when(transaction.getHash()).thenReturn(hash);
-        when(transaction.getSender()).thenReturn(rskAddress);
+        when(transaction.getSender(any(SignatureCache.class))).thenReturn(rskAddress);
         when(transaction.getReceiveAddress()).thenReturn(rskAddress);
 
         TransactionReceipt txReceipt = mock(TransactionReceipt.class);
@@ -89,7 +86,7 @@ void testErrorStatusField() {
 
         TransactionInfo txInfo = new TransactionInfo(txReceipt, hash.getBytes(), 0);
 
-        TransactionReceiptDTO transactionReceiptDTO = new TransactionReceiptDTO(block, txInfo);
+        TransactionReceiptDTO transactionReceiptDTO = new TransactionReceiptDTO(block, txInfo, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         String actualStatus = transactionReceiptDTO.getStatus();
 
@@ -108,7 +105,7 @@ void testErrorStatusFieldUsingEmptyByteArray() {
 
         Transaction transaction = mock(Transaction.class);
         when(transaction.getHash()).thenReturn(hash);
-        when(transaction.getSender()).thenReturn(rskAddress);
+        when(transaction.getSender(any(SignatureCache.class))).thenReturn(rskAddress);
         when(transaction.getReceiveAddress()).thenReturn(rskAddress);
 
         TransactionReceipt txReceipt = mock(TransactionReceipt.class);
@@ -119,7 +116,7 @@ void testErrorStatusFieldUsingEmptyByteArray() {
 
         TransactionInfo txInfo = new TransactionInfo(txReceipt, hash.getBytes(), 0);
 
-        TransactionReceiptDTO transactionReceiptDTO = new TransactionReceiptDTO(block, txInfo);
+        TransactionReceiptDTO transactionReceiptDTO = new TransactionReceiptDTO(block, txInfo, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         String actualStatus = transactionReceiptDTO.getStatus();
 
@@ -138,7 +135,7 @@ void testErrorStatusFieldUsingNullByteArray() {
 
         Transaction transaction = mock(Transaction.class);
         when(transaction.getHash()).thenReturn(hash);
-        when(transaction.getSender()).thenReturn(rskAddress);
+        when(transaction.getSender(any(SignatureCache.class))).thenReturn(rskAddress);
         when(transaction.getReceiveAddress()).thenReturn(rskAddress);
 
         TransactionReceipt txReceipt = mock(TransactionReceipt.class);
@@ -149,7 +146,7 @@ void testErrorStatusFieldUsingNullByteArray() {
 
         TransactionInfo txInfo = new TransactionInfo(txReceipt, hash.getBytes(), 0);
 
-        TransactionReceiptDTO transactionReceiptDTO = new TransactionReceiptDTO(block, txInfo);
+        TransactionReceiptDTO transactionReceiptDTO = new TransactionReceiptDTO(block, txInfo, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         String actualStatus = transactionReceiptDTO.getStatus();
 
diff --git a/rskj-core/src/test/java/org/ethereum/rpc/dto/TransactionResultDTOTest.java b/rskj-core/src/test/java/org/ethereum/rpc/dto/TransactionResultDTOTest.java
index 5c527409269..d76421ad38a 100644
--- a/rskj-core/src/test/java/org/ethereum/rpc/dto/TransactionResultDTOTest.java
+++ b/rskj-core/src/test/java/org/ethereum/rpc/dto/TransactionResultDTOTest.java
@@ -15,15 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.rpc.dto;
 
 import co.rsk.config.TestSystemProperties;
 import co.rsk.core.RskAddress;
 import co.rsk.remasc.RemascTransaction;
-import org.ethereum.core.Block;
-import org.ethereum.core.CallTransaction;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -45,7 +42,7 @@ class TransactionResultDTOTest {
     void remascAddressSerialization() {
         RemascTransaction remascTransaction = new RemascTransaction(new Random().nextLong());
 
-        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, remascTransaction, false);
+        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, remascTransaction, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         assertThat(dto.getFrom(), is("0x0000000000000000000000000000000000000000"));
         assertThat(dto.getR(), is(nullValue()));
         assertThat(dto.getS(), is(nullValue()));
@@ -61,7 +58,7 @@ void signedTransactionWithChainIdSerialization() {
 
         originalTransaction.sign(new byte[]{});
 
-        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, originalTransaction, false);
+        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, originalTransaction, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         Assertions.assertNotNull(dto.getR());
         Assertions.assertNotNull(dto.getS());
@@ -81,7 +78,7 @@ void transactionWithZeroNonce() {
 
         originalTransaction.sign(new byte[]{});
 
-        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, originalTransaction, false);
+        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, originalTransaction, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         Assertions.assertNotNull(dto.getNonce());
         Assertions.assertEquals("0x0", dto.getNonce());
@@ -96,7 +93,7 @@ void transactionWithOneNonceWithoutLeadingZeroes() {
 
         originalTransaction.sign(new byte[]{});
 
-        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, originalTransaction, false);
+        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, originalTransaction, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
         Assertions.assertNotNull(dto.getNonce());
         Assertions.assertEquals("0x1", dto.getNonce());
@@ -105,7 +102,7 @@ void transactionWithOneNonceWithoutLeadingZeroes() {
     @Test
     void transactionRemascHasSignatureNullWhenFlagIsFalse() {
         RemascTransaction remascTransaction = new RemascTransaction(new Random().nextLong());
-        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, remascTransaction, false);
+        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, remascTransaction, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         Assertions.assertNull(dto.getV());
         Assertions.assertNull(dto.getR());
         Assertions.assertNull(dto.getS());
@@ -114,7 +111,7 @@ void transactionRemascHasSignatureNullWhenFlagIsFalse() {
     @Test
     void transactionRemascHasSignatureZeroWhenFlagIsTrue() {
         RemascTransaction remascTransaction = new RemascTransaction(new Random().nextLong());
-        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, remascTransaction, true);
+        TransactionResultDTO dto = new TransactionResultDTO(mock(Block.class), 42, remascTransaction, true, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
         Assertions.assertEquals(HEX_ZERO, dto.getV());
         Assertions.assertEquals(HEX_ZERO, dto.getR());
         Assertions.assertEquals(HEX_ZERO, dto.getS());
diff --git a/rskj-core/src/test/java/org/ethereum/util/EthModuleTestUtils.java b/rskj-core/src/test/java/org/ethereum/util/EthModuleTestUtils.java
index 6d0dcec7731..5e13078cdd0 100644
--- a/rskj-core/src/test/java/org/ethereum/util/EthModuleTestUtils.java
+++ b/rskj-core/src/test/java/org/ethereum/util/EthModuleTestUtils.java
@@ -82,7 +82,7 @@ private static TransactionExecutorFactory buildBasicExecutorFactory(World world,
                 null,
                 null,
                 new ProgramInvokeFactoryImpl(),
-                new PrecompiledContracts(config, world.getBridgeSupportFactory()),
+                new PrecompiledContracts(config, world.getBridgeSupportFactory(), world.getBlockTxSignatureCache()),
                 null
         );
     }
diff --git a/rskj-core/src/test/java/org/ethereum/vm/PrecompiledContractTest.java b/rskj-core/src/test/java/org/ethereum/vm/PrecompiledContractTest.java
index 07d0ec6c40d..0536bbbe8a6 100644
--- a/rskj-core/src/test/java/org/ethereum/vm/PrecompiledContractTest.java
+++ b/rskj-core/src/test/java/org/ethereum/vm/PrecompiledContractTest.java
@@ -23,6 +23,8 @@
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.util.BIUtil;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.PrecompiledContracts.PrecompiledContract;
@@ -44,7 +46,7 @@ class PrecompiledContractTest {
 
 
     private final TestSystemProperties config = new TestSystemProperties();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
     @Test
     void identityTest1() throws VMException {
diff --git a/rskj-core/src/test/java/org/ethereum/vm/ProgramMemoryTest.java b/rskj-core/src/test/java/org/ethereum/vm/ProgramMemoryTest.java
index d22837d9d70..7997b0b82ca 100644
--- a/rskj-core/src/test/java/org/ethereum/vm/ProgramMemoryTest.java
+++ b/rskj-core/src/test/java/org/ethereum/vm/ProgramMemoryTest.java
@@ -22,6 +22,8 @@
 import co.rsk.config.TestSystemProperties;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.core.BlockFactory;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.program.Program;
 import org.ethereum.vm.program.invoke.ProgramInvokeMockImpl;
@@ -46,9 +48,10 @@ class ProgramMemoryTest {
     void createProgram() {
         TestSystemProperties config = new TestSystemProperties();
 
-        program = new Program(config.getVmConfig(), new PrecompiledContracts(config, null),
+        program = new Program(config.getVmConfig(), new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache())),
                 new BlockFactory(config.getActivationConfig()), mock(ActivationConfig.ForBlock.class),
-                ByteUtil.EMPTY_BYTE_ARRAY, pi, null, new HashSet<>());
+                ByteUtil.EMPTY_BYTE_ARRAY, pi, null, new HashSet<>(),
+                new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     }
 
     @Test
diff --git a/rskj-core/src/test/java/org/ethereum/vm/VMComplexTest.java b/rskj-core/src/test/java/org/ethereum/vm/VMComplexTest.java
index 8c5be74d289..061b1fdb0a4 100644
--- a/rskj-core/src/test/java/org/ethereum/vm/VMComplexTest.java
+++ b/rskj-core/src/test/java/org/ethereum/vm/VMComplexTest.java
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.vm;
 
 import co.rsk.config.TestSystemProperties;
@@ -25,9 +24,7 @@
 import co.rsk.core.RskAddress;
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
-import org.ethereum.core.AccountState;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Repository;
+import org.ethereum.core.*;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.vm.program.Program;
 import org.ethereum.vm.program.invoke.ProgramInvoke;
@@ -53,7 +50,7 @@ class VMComplexTest {
     private final TestSystemProperties config = new TestSystemProperties();
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
     private final VmConfig vmConfig = config.getVmConfig();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
     @Disabled("//TODO #POC9")
     @Test // contract call recursive
@@ -696,6 +693,6 @@ private VM getSubject() {
     }
 
     private Program getProgram(byte[] code, ProgramInvoke pi) {
-        return new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), code, pi, null, new HashSet<>());
+        return new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), code, pi, null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     }
 }
diff --git a/rskj-core/src/test/java/org/ethereum/vm/VMCustomTest.java b/rskj-core/src/test/java/org/ethereum/vm/VMCustomTest.java
index 454fca28fb4..5de517d2028 100644
--- a/rskj-core/src/test/java/org/ethereum/vm/VMCustomTest.java
+++ b/rskj-core/src/test/java/org/ethereum/vm/VMCustomTest.java
@@ -26,6 +26,8 @@
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.core.BlockFactory;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.vm.program.Program;
 import org.ethereum.vm.program.Program.OutOfGasException;
@@ -54,7 +56,7 @@ class VMCustomTest {
     private final TestSystemProperties config = new TestSystemProperties();
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
     private final VmConfig vmConfig = config.getVmConfig();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     private ProgramInvokeMockImpl invoke;
     private Program program;
 
@@ -532,7 +534,7 @@ private VM getSubject() {
     }
 
     private Program getProgram(String ops) {
-        return new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), Hex.decode(ops), invoke, null, new HashSet<>());
+        return new Program(vmConfig, precompiledContracts, blockFactory, mock(ActivationConfig.ForBlock.class), Hex.decode(ops), invoke, null, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     }
 
 }
diff --git a/rskj-core/src/test/java/org/ethereum/vm/VMTest.java b/rskj-core/src/test/java/org/ethereum/vm/VMTest.java
index 7c7224cb044..3a1af7de87d 100644
--- a/rskj-core/src/test/java/org/ethereum/vm/VMTest.java
+++ b/rskj-core/src/test/java/org/ethereum/vm/VMTest.java
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.ethereum.vm;
 
 import co.rsk.config.TestSystemProperties;
@@ -30,10 +29,7 @@
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Account;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.util.Utils;
 import org.ethereum.vm.program.Program;
@@ -71,7 +67,7 @@ public abstract class VMTest {
     private final TestSystemProperties config = new TestSystemProperties();
     private final BlockFactory blockFactory = new BlockFactory(config.getActivationConfig());
     private final VmConfig vmConfig = config.getVmConfig();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
     private static MockedStatic<LoggerFactory> loggerFactoryMocked;
 
@@ -3393,7 +3389,7 @@ private Program getProgram(byte[] code, Transaction transaction) {
     }
 
     private Program getProgram(byte[] code, Transaction transaction, boolean preFixStaticCall) {
-        return new Program(vmConfig, precompiledContracts, blockFactory, getBlockchainConfig(preFixStaticCall), code, invoke, transaction, new HashSet<>());
+        return new Program(vmConfig, precompiledContracts, blockFactory, getBlockchainConfig(preFixStaticCall), code, invoke, transaction, new HashSet<>(), new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
     }
 
     private byte[] compile(String code) {
diff --git a/rskj-core/src/test/java/org/ethereum/vm/program/NestedContractsTest.java b/rskj-core/src/test/java/org/ethereum/vm/program/NestedContractsTest.java
index e4e057d52fe..055270d9521 100644
--- a/rskj-core/src/test/java/org/ethereum/vm/program/NestedContractsTest.java
+++ b/rskj-core/src/test/java/org/ethereum/vm/program/NestedContractsTest.java
@@ -29,7 +29,9 @@
 import co.rsk.test.dsl.WorldDslProcessor;
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.config.Constants;
+import org.ethereum.core.BlockTxSignatureCache;
 import org.ethereum.core.CallTransaction;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.rpc.CallArguments;
 import org.ethereum.rpc.exception.RskJsonRpcRequestException;
 import org.ethereum.vm.DataWord;
@@ -197,7 +199,7 @@ private EthModule buildEthModule(World world) {
                 null,
                 null,
                 new ProgramInvokeFactoryImpl(),
-                new PrecompiledContracts(config, world.getBridgeSupportFactory()),
+                new PrecompiledContracts(config, world.getBridgeSupportFactory(), new BlockTxSignatureCache(new ReceivedTxSignatureCache())),
                 null
         );
 
diff --git a/rskj-core/src/test/java/org/ethereum/vm/program/ProgramResultTest.java b/rskj-core/src/test/java/org/ethereum/vm/program/ProgramResultTest.java
index 4290d330378..da0403c34ea 100644
--- a/rskj-core/src/test/java/org/ethereum/vm/program/ProgramResultTest.java
+++ b/rskj-core/src/test/java/org/ethereum/vm/program/ProgramResultTest.java
@@ -1,7 +1,28 @@
+/*
+ * This file is part of RskJ
+ * Copyright (C) 2017 RSK Labs Ltd.
+ * (derived from ethereumJ library, Copyright (c) 2016 <ether.camp>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.ethereum.vm.program;
 
 import co.rsk.config.TestSystemProperties;
 import java.math.BigInteger;
+
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
 import org.ethereum.core.Transaction;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.vm.DataWord;
@@ -27,7 +48,8 @@ void add_internal_tx_one_level_Ok() {
             new ECKey().getAddress(),
             new byte[] {},
             new byte[] {},
-            ""
+            "",
+            new BlockTxSignatureCache(new ReceivedTxSignatureCache())
         );
 
         Assertions.assertArrayEquals(originTx.getHash().getBytes(), internalTx.getOriginHash());
@@ -48,7 +70,8 @@ void add_interenal_tx_two_levels_Ok() {
             new ECKey().getAddress(),
             new byte[] {},
             new byte[] {},
-            ""
+            "",
+            new BlockTxSignatureCache(new ReceivedTxSignatureCache())
         );
         InternalTransaction internalTx2 = programResult.addInternalTransaction(
             internalTx1,
@@ -60,7 +83,8 @@ void add_interenal_tx_two_levels_Ok() {
             new ECKey().getAddress(),
             new byte[] {},
             new byte[] {},
-            ""
+            "",
+            new BlockTxSignatureCache(new ReceivedTxSignatureCache())
         );
 
         Assertions.assertArrayEquals(originTx.getHash().getBytes(), internalTx2.getOriginHash());
@@ -84,7 +108,8 @@ void add_interenal_tx_many_levels_Ok() {
                 new ECKey().getAddress(),
                 new byte[] {},
                 new byte[] {},
-                ""
+                "",
+                new BlockTxSignatureCache(new ReceivedTxSignatureCache())
             );
         }
         InternalTransaction result = (InternalTransaction)internalTxN;
diff --git a/rskj-core/src/test/java/org/ethereum/vm/program/ProgramTest.java b/rskj-core/src/test/java/org/ethereum/vm/program/ProgramTest.java
index f6cbc3c55be..5a4a778699a 100644
--- a/rskj-core/src/test/java/org/ethereum/vm/program/ProgramTest.java
+++ b/rskj-core/src/test/java/org/ethereum/vm/program/ProgramTest.java
@@ -24,10 +24,7 @@
 import com.google.common.collect.Sets;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
-import org.ethereum.core.Block;
-import org.ethereum.core.BlockFactory;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.MessageCall;
 import org.ethereum.vm.PrecompiledContracts;
@@ -53,7 +50,7 @@ class ProgramTest {
     protected static final int STACK_STATE_ERROR = 0;
 
     private final TestSystemProperties config = new TestSystemProperties();
-    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null);
+    private final PrecompiledContracts precompiledContracts = new PrecompiledContracts(config, null, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
 
     private final ProgramInvoke programInvoke = mock(ProgramInvoke.class);
     private final MessageCall msg = mock(MessageCall.class);
@@ -111,7 +108,8 @@ void setup() {
             null,
             programInvoke,
             transaction,
-            Sets.newHashSet()
+            Sets.newHashSet(),
+            new BlockTxSignatureCache(new ReceivedTxSignatureCache())
         );
         program.getResult().spendGas(TOTAL_GAS);
     }