diff --git a/aider/coders/chat_chunks.py b/aider/coders/chat_chunks.py
index 4e294bc27..881e781f2 100644
--- a/aider/coders/chat_chunks.py
+++ b/aider/coders/chat_chunks.py
@@ -53,17 +53,10 @@ class ChatChunks:
         messages[-1]["content"] = [content]
 
     def cacheable_messages(self):
-        chunks = (
-            self.system
-            + self.examples
-            + self.readonly_files
-            + self.repo
-            + self.done
-            + self.chat_files
-        )
-        for i, message in enumerate(reversed(chunks)):
+        messages = self.all_messages()
+        for i, message in enumerate(reversed(messages)):
             if isinstance(message.get("content"), list) and message["content"][0].get(
                 "cache_control"
             ):
-                return chunks[: len(chunks) - i]
-        return chunks
+                return messages[: len(messages) - i]
+        return messages