diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index fde107445206..94af83064f18 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -131,7 +131,7 @@ class SetupController extends Controller
 
             VersionCheck::dispatchNow();
             
-            $this->buildCache();
+            $this->buildCache(true);
 
             return redirect('/');
         } catch (Exception $e) {
diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index 1b9c6edb6b51..5a2ef08f1a30 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -36,22 +36,6 @@ class Gateway extends StaticModel
 
     protected $dateFormat = 'Y-m-d H:i:s.u';
 
-    // /**
-    //  * @return mixed
-    //  * @deprecated 5.0.17 No longer needs as we are removing omnipay dependence
-    //  */
-    // public function getFields()
-    // {
-    //     if ($this->isCustom()) {
-    //         return [
-    //             'name' => '',
-    //             'text' => '',
-    //         ];
-    //     } else {
-    //         return Omnipay::create($this->provider)->getDefaultParameters();
-    //     }
-    // }
-
     public function getOptionsAttribute()
     {
         return $this->getMethods();
diff --git a/app/Utils/Traits/AppSetup.php b/app/Utils/Traits/AppSetup.php
index c28e8ea66f90..cd8560b550cd 100644
--- a/app/Utils/Traits/AppSetup.php
+++ b/app/Utils/Traits/AppSetup.php
@@ -30,12 +30,12 @@ trait AppSetup
         return $check['system_health'] == 'true';
     }
 
-    public function buildCache()
+    public function buildCache($force = false)
     {
         $cached_tables = config('ninja.cached_tables');
 
         foreach ($cached_tables as $name => $class) {
-            if (request()->has('clear_cache') || ! Cache::has($name)) {
+            if (request()->has('clear_cache') || ! Cache::has($name) || $force) {
 
                 // check that the table exists in case the migration is pending
                 if (! Schema::hasTable((new $class())->getTable())) {