diff --git a/Src/AiCommitMessage/Services/Cache/CommitMessageCacheService.cs b/Src/AiCommitMessage/Services/Cache/CommitMessageCacheService.cs
new file mode 100644
index 00000000..c37113c4
--- /dev/null
+++ b/Src/AiCommitMessage/Services/Cache/CommitMessageCacheService.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AiCommitMessage.Services.Cache
+{
+    public class CommitMessageCacheService
+    {
+        private readonly ICacheProvider _cacheProvider;
+
+        public CommitMessageCacheService(ICacheProvider cacheProvider)
+        {
+            _cacheProvider = cacheProvider;
+        }
+
+        public async Task<string> GetOrGenerateAsync(
+            string model,
+            string branch,
+            string authorMessage,
+            string diff,
+            Func<Task<string>> generateFunc
+        )
+        {
+            string hash = _cacheProvider.GenerateHash(model, branch, authorMessage, diff);
+            string? cached = await _cacheProvider.LoadAsync(model, hash);
+            if (cached != null)
+            {
+                Console.WriteLine("\u2705 Loaded from cache.");
+                return cached;
+            }
+
+            string result = await generateFunc();
+            await _cacheProvider.SaveAsync(model, hash, result);
+            Console.WriteLine("\ud83d\udcac Cached new result.");
+            return result;
+        }
+    }
+}
diff --git a/Src/AiCommitMessage/Services/Cache/FileCacheProvider.cs b/Src/AiCommitMessage/Services/Cache/FileCacheProvider.cs
new file mode 100644
index 00000000..7ec4034a
--- /dev/null
+++ b/Src/AiCommitMessage/Services/Cache/FileCacheProvider.cs
@@ -0,0 +1,99 @@
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+
+namespace AiCommitMessage.Services.Cache
+{
+    public class FileCacheProvider : ICacheProvider
+    {
+        private record CachedResponse(
+            string Model,
+            string Response,
+            string Checksum,
+            DateTime Timestamp
+        );
+
+        private readonly string _cacheDir;
+
+        public FileCacheProvider(string appName = "CommitMessageTool")
+        {
+            var envPath = Environment.GetEnvironmentVariable("COMMIT_CACHE_PATH");
+            if (!string.IsNullOrWhiteSpace(envPath))
+            {
+                _cacheDir = Path.Combine(envPath, appName, "commit-cache");
+            }
+            else
+            {
+                var baseDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+                if (string.IsNullOrWhiteSpace(baseDir))
+                {
+                    var home =
+                        Environment.GetEnvironmentVariable("HOME")
+                        ?? Environment.GetEnvironmentVariable("USERPROFILE");
+                    if (string.IsNullOrEmpty(home))
+                    {
+                        throw new InvalidOperationException(
+                            "Unable to determine a valid user data directory"
+                        );
+                    }
+
+                    baseDir = Path.Combine(home, ".config");
+                }
+
+                _cacheDir = Path.Combine(baseDir, appName, "commit-cache");
+            }
+
+            Directory.CreateDirectory(_cacheDir);
+        }
+
+        public string GenerateHash(string model, string branch, string authorMessage, string diff)
+        {
+            var combined = $"{model}|{branch}|{authorMessage}|{diff}";
+            using var sha = SHA256.Create();
+            var hashBytes = sha.ComputeHash(Encoding.UTF8.GetBytes(combined));
+            return BitConverter.ToString(hashBytes).Replace("-", "").ToLowerInvariant();
+        }
+
+        public async Task<string?> LoadAsync(string model, string hash, int maxAgeDays = 30)
+        {
+            var path = Path.Combine(_cacheDir, $"{hash}.json");
+            if (!File.Exists(path))
+                return null;
+
+            var json = await File.ReadAllTextAsync(path);
+            var cached = JsonSerializer.Deserialize<CachedResponse>(json);
+            if (cached is null || cached.Model != model)
+            {
+                return null;
+            }
+
+            var expired = DateTime.UtcNow - cached.Timestamp > TimeSpan.FromDays(maxAgeDays);
+            var validChecksum = cached.Checksum == ComputeChecksum(model, cached.Response);
+
+            if (expired || !validChecksum)
+            {
+                File.Delete(path);
+                return null;
+            }
+
+            return cached.Response;
+        }
+
+        public async Task SaveAsync(string model, string hash, string response)
+        {
+            var path = Path.Combine(_cacheDir, $"{hash}.json");
+            var checksum = ComputeChecksum(model, response);
+            var cached = new CachedResponse(model, response, checksum, DateTime.UtcNow);
+            var json = JsonSerializer.Serialize(cached);
+            await File.WriteAllTextAsync(path, json);
+        }
+
+        private string ComputeChecksum(string model, string content)
+        {
+            using var sha = SHA256.Create();
+            var combined = $"{model}|{content}";
+            var hashBytes = sha.ComputeHash(Encoding.UTF8.GetBytes(combined));
+            return BitConverter.ToString(hashBytes).Replace("-", "").ToLowerInvariant();
+        }
+    }
+}
diff --git a/Src/AiCommitMessage/Services/Cache/ICacheProvider.cs b/Src/AiCommitMessage/Services/Cache/ICacheProvider.cs
new file mode 100644
index 00000000..5190e279
--- /dev/null
+++ b/Src/AiCommitMessage/Services/Cache/ICacheProvider.cs
@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+
+namespace AiCommitMessage.Services.Cache
+{
+    public interface ICacheProvider
+    {
+        string GenerateHash(string model, string branch, string authorMessage, string diff);
+        Task<string?> LoadAsync(string model, string hash, int maxAgeDays = 30);
+        Task SaveAsync(string model, string hash, string response);
+    }
+}