Simplify state cache, remove Condition. Keep to specific key registration only