diff --git a/src/Traits/Buildable.php b/src/Traits/Buildable.php
index 79e291a8..1cc7043c 100644
--- a/src/Traits/Buildable.php
+++ b/src/Traits/Buildable.php
@@ -1,6 +1,6 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Traits;
 
-use Illuminate\Container\Container;
+use Illuminate\Pagination\Paginator;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
@@ -153,11 +153,7 @@ public function paginate(
             return parent::paginate($perPage, $columns, $pageName, $page);
         }
 
-        $page = Container::getInstance()
-            ->make("request")
-            ->input($pageName)
-            ?: $page
-            ?: 1;
+        $page = $page ?: Paginator::resolveCurrentPage($pageName);
 
         if (is_array($page)) {
             $page = $this->recursiveImplodeWithKey($page);