diff --git a/agents-api/agents_api/models/chat/get_cached_response.py b/agents-api/agents_api/models/chat/get_cached_response.py
deleted file mode 100644
index 368c88567..000000000
--- a/agents-api/agents_api/models/chat/get_cached_response.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from beartype import beartype
-
-from ..utils import cozo_query
-
-
-@cozo_query
-@beartype
-def get_cached_response(key: str) -> tuple[str, dict]:
-    query = """
-        input[key] <- [[$key]]
-        ?[key, value] := input[key], *session_cache{key, value}
-        :limit 1
-    """
-
-    return (query, {"key": key})
diff --git a/agents-api/agents_api/models/chat/set_cached_response.py b/agents-api/agents_api/models/chat/set_cached_response.py
deleted file mode 100644
index 8625f3f1b..000000000
--- a/agents-api/agents_api/models/chat/set_cached_response.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from beartype import beartype
-
-from ..utils import cozo_query
-
-
-@cozo_query
-@beartype
-def set_cached_response(key: str, value: dict) -> tuple[str, dict]:
-    query = """
-        ?[key, value] <- [[$key, $value]]
-        
-        :insert session_cache {
-            key => value
-        }
-
-        :returning
-    """
-
-    return (query, {"key": key, "value": value})
diff --git a/agents-api/agents_api/models/chat/__init__.py b/agents-api/agents_api/queries/chat/__init__.py
similarity index 92%
rename from agents-api/agents_api/models/chat/__init__.py
rename to agents-api/agents_api/queries/chat/__init__.py
index 428b72572..2c05b4f8b 100644
--- a/agents-api/agents_api/models/chat/__init__.py
+++ b/agents-api/agents_api/queries/chat/__init__.py
@@ -17,6 +17,4 @@
 # ruff: noqa: F401, F403, F405
 
 from .gather_messages import gather_messages
-from .get_cached_response import get_cached_response
 from .prepare_chat_context import prepare_chat_context
-from .set_cached_response import set_cached_response
diff --git a/agents-api/agents_api/models/chat/gather_messages.py b/agents-api/agents_api/queries/chat/gather_messages.py
similarity index 100%
rename from agents-api/agents_api/models/chat/gather_messages.py
rename to agents-api/agents_api/queries/chat/gather_messages.py
diff --git a/agents-api/agents_api/models/chat/prepare_chat_context.py b/agents-api/agents_api/queries/chat/prepare_chat_context.py
similarity index 92%
rename from agents-api/agents_api/models/chat/prepare_chat_context.py
rename to agents-api/agents_api/queries/chat/prepare_chat_context.py
index f77686d7a..4731618f8 100644
--- a/agents-api/agents_api/models/chat/prepare_chat_context.py
+++ b/agents-api/agents_api/queries/chat/prepare_chat_context.py
@@ -3,7 +3,6 @@
 
 from beartype import beartype
 from fastapi import HTTPException
-from pycozo.client import QueryException
 from pydantic import ValidationError
 
 from ...common.protocol.sessions import ChatContext, make_session
@@ -22,13 +21,13 @@
 T = TypeVar("T")
 
 
-@rewrap_exceptions(
-    {
-        QueryException: partialclass(HTTPException, status_code=400),
-        ValidationError: partialclass(HTTPException, status_code=400),
-        TypeError: partialclass(HTTPException, status_code=400),
-    }
-)
+# TODO: implement this part
+# @rewrap_exceptions(
+#     {
+#         ValidationError: partialclass(HTTPException, status_code=400),
+#         TypeError: partialclass(HTTPException, status_code=400),
+#     }
+# )
 @wrap_in_class(
     ChatContext,
     one=True,