Skip to content

Compress tool outputs, logs, files, and RAG chunks before they reach the LLM. 20% fewer tokens for coding agents, 60-95% fewer tokens for JSON, same answers. Library, proxy, MCP server.

fix(cache): invalidate configured registry instances on replacement (#4363)

xiaoheiai4719-collab1bcdca2d9dd2
diff --git a/headroom/cache/registry.py b/headroom/cache/registry.py
index 6dca25add..2c043fcb4 100644
--- a/headroom/cache/registry.py
+++ b/headroom/cache/registry.py
@@ -31,7 +31,14 @@ class CacheOptimizerRegistry:
"""
_optimizers: dict[str, type[BaseCacheOptimizer]] = {}
- _instances: dict[str, BaseCacheOptimizer] = {}
+ _instances: dict[tuple[str, int | None], BaseCacheOptimizer] = {}
+
+ @classmethod
+ def _invalidate_instances(cls, name: str) -> None:
+ """Discard every configuration cached for this exact registration."""
+ for key in list(cls._instances):
+ if key[0] == name:
+ del cls._instances[key]
@classmethod
def register(
@@ -57,8 +64,8 @@ class CacheOptimizerRegistry:
f"Optimizer '{name}' already registered. Use override=True to replace."
)
cls._optimizers[name] = optimizer_class
- # Clear cached instance if exists
- cls._instances.pop(name, None)
+ # Configured instances must not outlive their registered implementation.
+ cls._invalidate_instances(name)
@classmethod
def unregister(cls, name: str) -> None:
@@ -69,7 +76,7 @@ class CacheOptimizerRegistry:
name: Name to unregister
"""
cls._optimizers.pop(name, None)
- cls._instances.pop(name, None)
+ cls._invalidate_instances(name)
@classmethod
def get(
@@ -109,7 +116,7 @@ class CacheOptimizerRegistry:
raise KeyError(f"No optimizer registered for '{key}'. Available: {available}")
# Return cached instance if requested
- cache_key = f"{key}:{id(config)}" if config else key
+ cache_key = (key, id(config) if config is not None else None)
if cached and cache_key in cls._instances:
return cls._instances[cache_key]
diff --git a/tests/test_cache/test_registry.py b/tests/test_cache/test_registry.py
index f0af96a74..eb8ed8733 100644
--- a/tests/test_cache/test_registry.py
+++ b/tests/test_cache/test_registry.py
@@ -101,6 +101,43 @@ class TestCacheOptimizerRegistry:
with pytest.raises(KeyError):
CacheOptimizerRegistry.get("unknown-provider")
+ @pytest.mark.parametrize("tier", ["oss", "enterprise"])
+ @pytest.mark.parametrize("replacement", ["override", "reregister"])
+ def test_replacing_registration_invalidates_all_configurations(
+ self, monkeypatch, tier, replacement
+ ):
+ monkeypatch.setattr(CacheOptimizerRegistry, "_optimizers", {})
+ monkeypatch.setattr(CacheOptimizerRegistry, "_instances", {})
+
+ class ReplacementOptimizer(MockOptimizer):
+ pass
+
+ name = "plugin" if tier == "oss" else "plugin-enterprise"
+ CacheOptimizerRegistry.register(name, MockOptimizer)
+ configs = [None, CacheConfig(), CacheConfig(min_cacheable_tokens=2048)]
+ old_instances = [
+ CacheOptimizerRegistry.get("plugin", tier=tier, config=config) for config in configs
+ ]
+ neighbor = f"{name}-neighbor"
+ CacheOptimizerRegistry.register(neighbor, MockOptimizer)
+ unrelated = CacheOptimizerRegistry.get(neighbor, config=configs[1])
+
+ if replacement == "reregister":
+ CacheOptimizerRegistry.unregister(name)
+ assert not any(
+ instance in CacheOptimizerRegistry._instances.values() for instance in old_instances
+ )
+ CacheOptimizerRegistry.register(name, ReplacementOptimizer)
+ else:
+ CacheOptimizerRegistry.register(name, ReplacementOptimizer, override=True)
+
+ for config, old in zip(configs, old_instances):
+ new = CacheOptimizerRegistry.get("plugin", tier=tier, config=config)
+ assert isinstance(new, ReplacementOptimizer)
+ assert new is not old
+ assert CacheOptimizerRegistry.get("plugin", tier=tier, config=config) is new
+ assert CacheOptimizerRegistry.get(neighbor, config=configs[1]) is unrelated
+
def test_list_providers(self):
"""Test listing providers."""
providers = CacheOptimizerRegistry.list_providers()