diff --git a/src/Http/Controllers/StatamicRewriteController.php b/src/Http/Controllers/StatamicRewriteController.php
deleted file mode 100644
index c9a7465..0000000
--- a/src/Http/Controllers/StatamicRewriteController.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Rapidez\Statamic\Http\Controllers;
-
-use Illuminate\Http\Request;
-use Statamic\Facades\Entry;
-use Illuminate\Support\Facades\View;
-use Statamic\Exceptions\NotFoundHttpException;
-
-class StatamicRewriteController
-{
-    public function __invoke(Request $request)
-    {
-        $storeCode = config()->get('rapidez.store_code');
-
-        $entry = Entry::query()
-            ->where('collection', 'pages')
-            ->where('locale', $storeCode)
-            ->where('slug', $request->path() == '/' ? 'home' : $request->path())
-            ->first();
-
-        if (!$entry) {
-            throw new NotFoundHttpException();
-        }
-
-        $template = View::exists($entry->template()) ? $entry->template() : $entry->blueprint->handle();
-
-        echo view($template, ['entry' => $entry]);
-    }
-}
diff --git a/src/Http/StatamicDataComposer.php b/src/Http/ViewComposers/StatamicDataComposer.php
similarity index 94%
rename from src/Http/StatamicDataComposer.php
rename to src/Http/ViewComposers/StatamicDataComposer.php
index 31b92f2..f4eaa66 100644
--- a/src/Http/StatamicDataComposer.php
+++ b/src/Http/ViewComposers/StatamicDataComposer.php
@@ -1,6 +1,7 @@
 <?php
 
-namespace Rapidez\Statamic\Http;
+namespace Rapidez\Statamic\Http\ViewComposers;
+
 use Illuminate\Support\Facades\Cache;
 use Illuminate\View\View;
 use Statamic\Facades\GlobalSet;
diff --git a/src/RapidezStatamicServiceProvider.php b/src/RapidezStatamicServiceProvider.php
index fc79fb2..e3d986b 100644
--- a/src/RapidezStatamicServiceProvider.php
+++ b/src/RapidezStatamicServiceProvider.php
@@ -3,8 +3,7 @@
 namespace Rapidez\Statamic;
 
 use Illuminate\Support\ServiceProvider;
-use TorMorten\Eventy\Facades\Eventy;
-
+use Statamic\Http\Controllers\FrontendController;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Event;
 use Rapidez\Statamic\Commands\SyncProductsCommand;
@@ -12,11 +11,12 @@
 use Statamic\Facades\Entry;
 use Statamic\Stache\Repositories\EntryRepository as StatamicEntryRepository;
 use Rapidez\Statamic\Repositories\EntryRepository;
-use Rapidez\Statamic\Http\StatamicDataComposer;
+use Rapidez\Statamic\Http\ViewComposers\StatamicDataComposer;
 use Statamic\Statamic;
 use Illuminate\Support\Facades\View;
 use Illuminate\View\View as RenderedView;
 use Statamic\Facades\Site;
+use Rapidez\Core\Facades\Rapidez;
 use Validator;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetDeleted;
@@ -31,26 +31,27 @@ public function boot()
             ->bootConfig()
             ->bootRepositories()
             ->bootPublishables()
-            ->bootFilters()
             ->bootComposers()
-            ->bootListeners();
+            ->bootListeners()
+            ->bootRoutes();
     }
 
-    public function bootConfig() : self
+    public function bootRoutes() : self
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/statamic.php', 'statamic');
+        if (!$this->app->routesAreCached()) {
+            Rapidez::addFallbackRoute([FrontendController::class, 'index'], 100);
+        }
 
         return $this;
     }
 
-    public function bootFilters() : self
+    public function bootConfig() : self
     {
-        Eventy::addFilter('routes', fn ($routes) => array_merge($routes ?: [], [__DIR__.'/../routes/fallback.php']));
+        $this->mergeConfigFrom(__DIR__.'/../config/statamic.php', 'statamic');
 
         return $this;
     }
 
-
     public function bootCommands() : self
     {
         $this->commands([