diff --git a/composer.json b/composer.json
index 920fd258e036a0cb4f07ba19c6c6e1560d24e184..82b0404b76a2e25c31d0fba3cdd6668ff877afbc 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
   "require": {
     "php": ">=5.5",
     "psr/log": "^1.0.1",
-    "wpdesk/wp-cache": "^1.0",
+    "wpdesk/wp-cache": "dev-feature/cache-resolver-creator",
     "wpdesk/wp-http-client": "^1.0",
     "psr/simple-cache": "^1.0"
   },
diff --git a/src/Client/CachedClient.php b/src/Client/CachedClient.php
index 3c6ee45eaf5147791ff18ab96cf7957ea2b54497..0a9b26c67974d7f338102cc4ac42ace0fb1bae81 100644
--- a/src/Client/CachedClient.php
+++ b/src/Client/CachedClient.php
@@ -4,6 +4,7 @@ namespace WPDesk\ApiClient\Client;
 
 use Psr\SimpleCache\CacheInterface;
 use WPDesk\Cache\CacheDispatcher;
+use WPDesk\Cache\CacheInfoResolverCreator;
 use WPDesk\Cache\CacheItemCreator;
 use WPDesk\Cache\CacheItemVerifier;
 use WPDesk\HttpClient\HttpClient;
@@ -27,14 +28,29 @@ class CachedClient implements Client, CacheItemCreator, CacheItemVerifier
 
     /**
      * CachedClient constructor.
+     *
      * @param Client $decorated Decorated client
      * @param CacheInterface $cache
      */
     public function __construct(Client $decorated, CacheInterface $cache)
     {
         $this->client = $decorated;
-        $this->cache = $cache;
-        $this->cacheDispatcher = new CacheDispatcher($cache, [new RequestCacheInfoResolver()]);
+        $this->cache  = $cache;
+        $this->cacheDispatcher = new CacheDispatcher($cache, $this->getCacheInfoResolvers());
+    }
+
+    /**
+     * Get cache info resolvers.
+     *
+     * @return RequestCacheInfoResolver[]
+     */
+    protected function getCacheInfoResolvers()
+    {
+        if ($this->client instanceof CacheInfoResolverCreator) {
+            return $this->client->createResolvers();
+        } else {
+            return [new RequestCacheInfoResolver()];
+        }
     }
 
     /**