diff --git a/.gitlab-ci/bin/gitlab_gql.py b/.gitlab-ci/bin/gitlab_gql.py
index c6e869995a7..57922ec7ab1 100755
--- a/.gitlab-ci/bin/gitlab_gql.py
+++ b/.gitlab-ci/bin/gitlab_gql.py
@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import Any, Iterable, Optional, Pattern, Union
 
 import yaml
+from filecache import DAY, filecache
 from gql import Client, gql
 from gql.transport.aiohttp import AIOHTTPTransport
 from graphql import DocumentNode
@@ -57,6 +58,7 @@ class GitlabGQL:
             transport=self._transport, fetch_schema_from_transport=True
         )
 
+    @filecache(DAY)
     def query(
         self, gql_file: Union[Path, str], params: dict[str, Any]
     ) -> dict[str, Any]:
@@ -72,6 +74,9 @@ class GitlabGQL:
         # Execute the query on the transport
         return self.client.execute(query, variable_values=params)
 
+    def invalidate_query_cache(self):
+        self.query._db.clear()
+
 
 def create_job_needs_dag(
     gl_gql: GitlabGQL, params
@@ -121,12 +126,16 @@ def fetch_merged_yaml(gl_gql: GitlabGQL, params) -> dict[Any]:
     content = Path(gitlab_yml_file).read_text()
     params["content"] = content
     raw_response = gl_gql.query("job_details.gql", params)
-    merged_yaml = raw_response["ciConfig"]["mergedYaml"]
-    assert merged_yaml, """
+    if merged_yaml := raw_response["ciConfig"]["mergedYaml"]:
+        return yaml.safe_load(merged_yaml)
+
+    gl_gql.invalidate_query_cache()
+    raise ValueError(
+        """
     Could not fetch any content for merged YAML,
     please verify if the git SHA exists in remote.
-    Maybe you forgot to `git push`?"""
-    return yaml.safe_load(merged_yaml)
+    Maybe you forgot to `git push`?  """
+    )
 
 
 def recursive_fill(job, relationship_field, target_data, acc_data: dict, merged_yaml):
diff --git a/.gitlab-ci/bin/requirements.txt b/.gitlab-ci/bin/requirements.txt
index 777cd557f90..ddb67c9f94f 100644
--- a/.gitlab-ci/bin/requirements.txt
+++ b/.gitlab-ci/bin/requirements.txt
@@ -1,4 +1,5 @@
 colorama==0.4.5
+filecache==0.81
 gql==3.4.0
 python-gitlab==3.5.0
 ruamel.yaml.clib==0.2.6