diff --git a/teos/__init__.py b/teos/__init__.py
index 7c986bf..b65b7e7 100644
--- a/teos/__init__.py
+++ b/teos/__init__.py
@@ -21,7 +21,7 @@ DEFAULT_CONF = {
     "DEFAULT_SUBSCRIPTION_DURATION": {"value": 4320, "type": int},
     "EXPIRY_DELTA": {"value": 6, "type": int},
     "MIN_TO_SELF_DELAY": {"value": 20, "type": int},
-    "BLOCK_CACHE_SIZE": {"value": 6, "type": int},
+    "LOCATOR_CACHE_SIZE": {"value": 6, "type": int},
     "LOG_FILE": {"value": "teos.log", "type": str, "path": True},
     "TEOS_SECRET_KEY": {"value": "teos_sk.der", "type": str, "path": True},
     "APPOINTMENTS_DB_PATH": {"value": "appointments", "type": str, "path": True},
diff --git a/teos/teosd.py b/teos/teosd.py
index c9f0a02..f1fa1df 100644
--- a/teos/teosd.py
+++ b/teos/teosd.py
@@ -90,7 +90,7 @@ def main(command_line_conf):
                 responder,
                 secret_key_der,
                 config.get("MAX_APPOINTMENTS"),
-                config.get("BLOCK_CACHE_SIZE"),
+                config.get("LOCATOR_CACHE_SIZE"),
             )
 
             # Create the chain monitor and start monitoring the chain
diff --git a/test/teos/unit/test_api.py b/test/teos/unit/test_api.py
index 6f3840b..145fa8a 100644
--- a/test/teos/unit/test_api.py
+++ b/test/teos/unit/test_api.py
@@ -75,7 +75,7 @@ def api(db_manager, carrier, block_processor, gatekeeper, run_bitcoind):
         responder,
         sk.to_der(),
         MAX_APPOINTMENTS,
-        config.get("BLOCK_CACHE_SIZE"),
+        config.get("LOCATOR_CACHE_SIZE"),
     )
     inspector = Inspector(block_processor, config.get("MIN_TO_SELF_DELAY"))
     api = API(config.get("API_HOST"), config.get("API_PORT"), inspector, watcher)
diff --git a/test/teos/unit/test_builder.py b/test/teos/unit/test_builder.py
index 81f7b5c..581581e 100644
--- a/test/teos/unit/test_builder.py
+++ b/test/teos/unit/test_builder.py
@@ -102,7 +102,7 @@ def test_update_states_empty_list(db_manager, gatekeeper, carrier, block_process
         responder=Responder(db_manager, gatekeeper, carrier, block_processor),
         sk_der=generate_keypair()[0].to_der(),
         max_appointments=config.get("MAX_APPOINTMENTS"),
-        blocks_in_cache=config.get("BLOCK_CACHE_SIZE"),
+        blocks_in_cache=config.get("LOCATOR_CACHE_SIZE"),
     )
 
     missed_blocks_watcher = []
@@ -124,7 +124,7 @@ def test_update_states_responder_misses_more(run_bitcoind, db_manager, gatekeepe
         responder=Responder(db_manager, gatekeeper, carrier, block_processor),
         sk_der=generate_keypair()[0].to_der(),
         max_appointments=config.get("MAX_APPOINTMENTS"),
-        blocks_in_cache=config.get("BLOCK_CACHE_SIZE"),
+        blocks_in_cache=config.get("LOCATOR_CACHE_SIZE"),
     )
 
     blocks = []
@@ -150,7 +150,7 @@ def test_update_states_watcher_misses_more(db_manager, gatekeeper, carrier, bloc
         responder=Responder(db_manager, gatekeeper, carrier, block_processor),
         sk_der=generate_keypair()[0].to_der(),
         max_appointments=config.get("MAX_APPOINTMENTS"),
-        blocks_in_cache=config.get("BLOCK_CACHE_SIZE"),
+        blocks_in_cache=config.get("LOCATOR_CACHE_SIZE"),
     )
 
     blocks = []