diff --git a/src/Models/EmailTemplate.php b/src/Models/EmailTemplate.php
index c749d65..4269409 100644
--- a/src/Models/EmailTemplate.php
+++ b/src/Models/EmailTemplate.php
@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\URL;
@@ -139,6 +140,15 @@ public static function clearEmailTemplateCache($key, $language)
     {
         $cacheKey = "email_by_key_{$key}_{$language}";
         Cache::forget($cacheKey);
+
+        // Clear Laravel's compiled Blade view cache
+        // This ensures that any cached compiled views are regenerated
+        Artisan::call('view:clear');
+
+        // Clear OPcache if enabled (for precompiled PHP files)
+        if (function_exists('opcache_reset')) {
+            opcache_reset();
+        }
     }
 
     /**
diff --git a/tests/EmailTemplateCacheInvalidationTest.php b/tests/EmailTemplateCacheInvalidationTest.php
new file mode 100644
index 0000000..3374e4f
--- /dev/null
+++ b/tests/EmailTemplateCacheInvalidationTest.php
@@ -0,0 +1,98 @@
+<?php
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Mail;
+use Visualbuilder\EmailTemplates\Mail\UserRegisteredEmail;
+use Visualbuilder\EmailTemplates\Models\EmailTemplate;
+use Visualbuilder\EmailTemplates\Models\EmailTemplateTheme;
+
+beforeEach(function () {
+    Cache::flush();
+    Mail::fake();
+
+    // Create a theme for the template
+    $this->theme = EmailTemplateTheme::factory()->create([
+        'is_default' => true,
+    ]);
+});
+
+it('uses updated template content immediately after save', function () {
+    // 1. Create an email template with original content
+    $template = EmailTemplate::factory()->create([
+        'key' => 'test-cache-invalidation',
+        'language' => config('filament-email-templates.default_locale'),
+        'subject' => 'Original Subject',
+        'content' => '<p>Original Content</p>',
+        'view' => 'default',
+        'from' => ['email' => 'test@example.com', 'name' => 'Test'],
+    ]);
+
+    // 2. Retrieve the template (this will cache it)
+    $cachedTemplate = EmailTemplate::findEmailByKey('test-cache-invalidation', config('filament-email-templates.default_locale'));
+    expect($cachedTemplate->content)->toBe('<p>Original Content</p>');
+    expect($cachedTemplate->subject)->toBe('Original Subject');
+
+    // 3. Update the template content
+    $template->update([
+        'subject' => 'Updated Subject',
+        'content' => '<p>Updated Content</p>',
+    ]);
+
+    // 4. Retrieve the template again - should get updated content, not cached
+    $updatedTemplate = EmailTemplate::findEmailByKey('test-cache-invalidation', config('filament-email-templates.default_locale'));
+
+    // 5. Assert the new template contains updated content immediately
+    expect($updatedTemplate->content)->toBe('<p>Updated Content</p>');
+    expect($updatedTemplate->subject)->toBe('Updated Subject');
+
+    // 6. Verify database has the updated content
+    $freshTemplate = EmailTemplate::where('key', 'test-cache-invalidation')->first();
+    expect($freshTemplate->content)->toBe('<p>Updated Content</p>');
+    expect($freshTemplate->subject)->toBe('Updated Subject');
+});
+
+it('clears cache when template is updated', function () {
+    $template = EmailTemplate::factory()->create([
+        'key' => 'cache-test',
+        'language' => config('filament-email-templates.default_locale'),
+        'content' => '<p>Original</p>',
+        'view' => 'default',
+        'from' => ['email' => 'test@example.com', 'name' => 'Test'],
+    ]);
+
+    // Cache the template
+    EmailTemplate::findEmailByKey('cache-test', config('filament-email-templates.default_locale'));
+    $cacheKey = "email_by_key_cache-test_" . config('filament-email-templates.default_locale');
+
+    // Verify cache exists
+    expect(Cache::has($cacheKey))->toBeTrue();
+
+    // Update the template (should clear cache)
+    $template->update(['content' => '<p>Updated</p>']);
+
+    // Verify cache was cleared
+    expect(Cache::has($cacheKey))->toBeFalse();
+});
+
+it('clears cache when template is deleted', function () {
+    $template = EmailTemplate::factory()->create([
+        'key' => 'delete-test',
+        'language' => config('filament-email-templates.default_locale'),
+        'content' => '<p>Content</p>',
+        'view' => 'default',
+        'from' => ['email' => 'test@example.com', 'name' => 'Test'],
+    ]);
+
+    // Cache the template
+    EmailTemplate::findEmailByKey('delete-test', config('filament-email-templates.default_locale'));
+    $cacheKey = "email_by_key_delete-test_" . config('filament-email-templates.default_locale');
+
+    // Verify cache exists
+    expect(Cache::has($cacheKey))->toBeTrue();
+
+    // Delete the template (should clear cache)
+    $template->delete();
+
+    // Verify cache was cleared
+    expect(Cache::has($cacheKey))->toBeFalse();
+});