diff --git a/Classes/EventListener/IndexContent.php b/Classes/EventListener/IndexContent.php
new file mode 100644
index 0000000..3626054
--- /dev/null
+++ b/Classes/EventListener/IndexContent.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace VV\T3meilisearch\EventListener;
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Frontend\Event\AfterCacheableContentIsGeneratedEvent;
+use VV\T3meilisearch\Domain\Model\Document;
+use VV\T3meilisearch\Service\IndexService;
+
+class IndexContent
+{
+    public function __invoke(AfterCacheableContentIsGeneratedEvent $event): void
+    {
+        // Only do this when caching is enabled
+        if ($event->isCachingEnabled() === false) {
+            return;
+        }
+
+        $tsfe = $event->getController();
+
+        if ((int) $tsfe->page['no_search'] === 1 || (int) $tsfe->page['no_index'] === 1) {
+            return;
+        }
+
+        $indexService = GeneralUtility::makeInstance(IndexService::class);
+
+        if ($tsfe->content !== '') {
+            $indexService->add(Document::createFromTSFE($tsfe));
+        }
+
+        $indexService->checkForFiles($tsfe);
+    }
+}
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index 6f3857f..6c9a045 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -7,6 +7,10 @@ services:
   VV\T3meilisearch\:
     resource: '../Classes/*'
 
+  VV\T3meilisearch\EventListener\IndexContent:
+    tags:
+      - name: event.listener
+
   VV\T3meilisearch\EventListener\AddVersionToSystemInformationToolbar:
    tags:
       - name: event.listener