diff --git a/docs/en/mkdocs.yml b/docs/en/mkdocs.yml
index 323035240..21cb02060 100644
--- a/docs/en/mkdocs.yml
+++ b/docs/en/mkdocs.yml
@@ -150,6 +150,7 @@ nav:
     - tutorial/middleware.md
     - tutorial/cors.md
     - tutorial/sql-databases.md
+    - tutorial/nosql-databases.md
     - tutorial/bigger-applications.md
     - tutorial/background-tasks.md
     - tutorial/metadata.md
diff --git a/docs_src/nosql_databases/tutorial001.py b/docs_src/nosql_databases/tutorial001.py
index f8f5e5192..15caa064b 100644
--- a/docs_src/nosql_databases/tutorial001.py
+++ b/docs_src/nosql_databases/tutorial001.py
@@ -89,7 +89,7 @@ def create_task(task: TaskCreate, session=Depends(get_db)):
         VALUES (%s, %s, %s, %s, toTimestamp(now()), toTimestamp(now()))
     """
     session.execute(query, (task_id, task.title, task.description, task.status))
-    return Task(id=task_id, **task.model_dump())
+    return Task(id=task_id, title=task.title, description=task.description, status=task.status)
 
 
 @app.get("/tasks/", response_model=List[Task])
@@ -127,7 +127,7 @@ def update_task(task_id: UUID, task: TaskCreate, session=Depends(get_db)):
     session.execute(
         update_query, (task.title, task.description, task.status, task_id)
     )
-    return Task(id=task_id, **task.model_dump())
+    return Task(id=task_id, title=task.title, description=task.description, status=task.status)
 
 
 @app.delete("/tasks/{task_id}")
diff --git a/docs_src/nosql_databases/tutorial001_scylla.py b/docs_src/nosql_databases/tutorial001_scylla.py
index 82d5e6ea6..a48c30be4 100644
--- a/docs_src/nosql_databases/tutorial001_scylla.py
+++ b/docs_src/nosql_databases/tutorial001_scylla.py
@@ -89,7 +89,7 @@ def create_task(task: TaskCreate, session=Depends(get_db)):
         VALUES (%s, %s, %s, %s, toTimestamp(now()), toTimestamp(now()))
     """
     session.execute(query, (task_id, task.title, task.description, task.status))
-    return Task(id=task_id, **task.model_dump())
+    return Task(id=task_id, title=task.title, description=task.description, status=task.status)
 
 
 @app.get("/tasks/", response_model=List[Task])
@@ -127,7 +127,7 @@ def update_task(task_id: UUID, task: TaskCreate, session=Depends(get_db)):
     session.execute(
         update_query, (task.title, task.description, task.status, task_id)
     )
-    return Task(id=task_id, **task.model_dump())
+    return Task(id=task_id, title=task.title, description=task.description, status=task.status)
 
 
 @app.delete("/tasks/{task_id}")
diff --git a/tests/test_tutorial/test_nosql_databases/conftest.py b/tests/test_tutorial/test_nosql_databases/conftest.py
index 1855b3fbe..a3a374794 100644
--- a/tests/test_tutorial/test_nosql_databases/conftest.py
+++ b/tests/test_tutorial/test_nosql_databases/conftest.py
@@ -8,5 +8,8 @@ mock_cassandra = ModuleType('cassandra')
 mock_cassandra_cluster = ModuleType('cassandra.cluster')
 mock_cassandra_cluster.Cluster = MagicMock
 
+# Set cluster attribute on cassandra module
+mock_cassandra.cluster = mock_cassandra_cluster
+
 sys.modules['cassandra'] = mock_cassandra
 sys.modules['cassandra.cluster'] = mock_cassandra_cluster
diff --git a/tests/test_tutorial/test_nosql_databases/test_tutorial001.py b/tests/test_tutorial/test_nosql_databases/test_tutorial001.py
index 653a92ac9..dee2ffd6b 100644
--- a/tests/test_tutorial/test_nosql_databases/test_tutorial001.py
+++ b/tests/test_tutorial/test_nosql_databases/test_tutorial001.py
@@ -1,5 +1,5 @@
 import importlib
-from typing import Any
+from typing import Any, List
 from unittest.mock import MagicMock, patch
 from uuid import UUID
 
@@ -18,7 +18,7 @@ class MockRow:
 
 
 class MockResult:
-    def __init__(self, rows: list[MockRow]):
+    def __init__(self, rows: List[MockRow]):
         self._rows = rows
         self._iter = iter(rows)