diff --git a/src/Http/Middleware/CacheTracker.php b/src/Http/Middleware/CacheTracker.php
index 1d17405..b603029 100644
--- a/src/Http/Middleware/CacheTracker.php
+++ b/src/Http/Middleware/CacheTracker.php
@@ -10,6 +10,7 @@
 use Statamic\Contracts\Assets\Asset;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\Globals\Variables;
+use Statamic\Facades\Collection;
 use Statamic\Facades\StaticCache;
 use Statamic\Facades\URL;
 use Statamic\Forms;
@@ -135,12 +136,19 @@ private function setupAugmentationHooks(string $url)
             return $next($augmented);
         });
 
-        app(Entry::class)::hook('augmented', function ($augmented, $next) use ($self) {
+        $trackEntry = function ($augmented, $next) use ($self) {
             $self->addContentTag($this->collection()->handle().':'.$this->id());
             $self->addContentTag('collection:'.$this->collection()->handle());
 
             return $next($augmented);
-        });
+        };
+
+        Collection::all()
+            ->map->entryClass()
+            ->push(app(Entry::class)::class)
+            ->filter()
+            ->unique()
+            ->each(fn ($class) => $class::hook('augmented', $trackEntry));
 
         Page::hook('augmented', function ($augmented, $next) use ($self) {
             if ($entry = $this->entry()) {
diff --git a/tests/Unit/CustomEntryClassTest.php b/tests/Unit/CustomEntryClassTest.php
new file mode 100644
index 0000000..67ce67a
--- /dev/null
+++ b/tests/Unit/CustomEntryClassTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Thoughtco\StatamicCacheTracker\Tests\Unit;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Entries\Entry;
+use Statamic\Facades;
+use Thoughtco\StatamicCacheTracker\Facades\Tracker;
+use Thoughtco\StatamicCacheTracker\Tests\TestCase;
+
+class CustomEntryClassTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Facades\Collection::make('articles')
+            ->title('Articles')
+            ->routes('/articles/{slug}')
+            ->entryClass(CustomEntry::class)
+            ->save();
+    }
+
+    #[Test]
+    public function it_tracks_entries_of_a_collection_with_a_custom_entry_class()
+    {
+        $entry = Facades\Entry::make()
+            ->id('article-1')
+            ->collection('articles')
+            ->slug('one')
+            ->data(['title' => 'One']);
+
+        $entry->save();
+
+        $this->assertInstanceOf(CustomEntry::class, $entry->fresh());
+
+        $this->get($entry->url())->assertOk();
+
+        $tags = collect(Tracker::all())->firstWhere('url', $entry->absoluteUrl())['tags'];
+
+        $this->assertContains('articles:article-1', $tags);
+        $this->assertContains('collection:articles', $tags);
+    }
+
+    #[Test]
+    public function it_invalidates_a_tracked_url_when_a_custom_entry_class_entry_is_saved()
+    {
+        $entry = Facades\Entry::make()
+            ->id('article-1')
+            ->collection('articles')
+            ->slug('one')
+            ->data(['title' => 'One']);
+
+        $entry->save();
+
+        $this->get($entry->url())->assertOk();
+
+        $this->assertNotNull(Tracker::get($entry->absoluteUrl()));
+
+        $entry->fresh()->set('title', 'Two')->save();
+
+        $this->assertNull(Tracker::get($entry->absoluteUrl()));
+    }
+}
+
+class CustomEntry extends Entry {}