diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa475ea8025b..2e512b67fb86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Incorrectly determined video frame count when the video contains an MP4 edit list
   (<https://github.com/opencv/cvat/pull/6929>)
+- Internal server error when retrieving data from CS and cache=True
+  (<https://github.com/opencv/cvat/pull/6932>)
 
 ### Security
 
diff --git a/tests/python/rest_api/test_tasks.py b/tests/python/rest_api/test_tasks.py
index 07f887bd9a7f..9d646565f3e2 100644
--- a/tests/python/rest_api/test_tasks.py
+++ b/tests/python/rest_api/test_tasks.py
@@ -1419,7 +1419,12 @@ def test_create_task_with_file_pattern(
             assert "No media data found" in status.message
 
     @pytest.mark.with_external_services
-    @pytest.mark.parametrize("cloud_storage_id, org", [(1, ""),])
+    @pytest.mark.parametrize(
+        "cloud_storage_id, org",
+        [
+            (1, ""),
+        ],
+    )
     def test_create_task_with_cloud_storage_and_retrieve_data(
         self,
         cloud_storage_id,
@@ -1427,13 +1432,12 @@ def test_create_task_with_cloud_storage_and_retrieve_data(
         request,
         org,
     ):
-
         cloud_storage = cloud_storages[cloud_storage_id]
         task_id, _ = self._create_task_with_cloud_data(
             request=request,
             cloud_storage=cloud_storage,
             use_manifest=True,
-            use_cache = True,
+            use_cache=True,
             server_files=[],
             org=org,
         )
@@ -1444,7 +1448,6 @@ def test_create_task_with_cloud_storage_and_retrieve_data(
             )
             assert response.status == HTTPStatus.OK
 
-
     def test_can_specify_file_job_mapping(self):
         task_spec = {
             "name": f"test file-job mapping",