diff --git a/addon/lib/cache.js b/addon/lib/cache.js
index 3448032..042389b 100644
--- a/addon/lib/cache.js
+++ b/addon/lib/cache.js
@@ -4,19 +4,16 @@ const mangodbStore = require('cache-manager-mongodb');
 const GLOBAL_KEY_PREFIX = 'torrentio-addon';
 const STREAM_KEY_PREFIX = `${GLOBAL_KEY_PREFIX}|stream`;
 const RESOLVED_URL_KEY_PREFIX = `${GLOBAL_KEY_PREFIX}|resolved`;
-const PROXY_KEY_PREFIX = `${GLOBAL_KEY_PREFIX}|proxy`;
-const USER_AGENT_KEY_PREFIX = `${GLOBAL_KEY_PREFIX}|agent`;
 
 const STREAM_TTL = process.env.STREAM_TTL || 4 * 60 * 60; // 4 hours
 const STREAM_EMPTY_TTL = process.env.STREAM_EMPTY_TTL || 30 * 60; // 30 minutes
-const RESOLVED_URL_TTL = 2 * 60; // 2 minutes
-const PROXY_TTL = 30 * 60; // 60 minutes
-const USER_AGENT_TTL = 2 * 24 * 60 * 60; // 2 days
+const RESOLVED_URL_TTL = 60; // 2 minutes
 // When the streams are empty we want to cache it for less time in case of timeouts or failures
 
 const MONGO_URI = process.env.MONGODB_URI;
 const NO_CACHE = process.env.NO_CACHE || false;
 
+const memoryCache = initiateMemoryCache();
 const remoteCache = initiateRemoteCache();
 
 function initiateRemoteCache() {
@@ -43,6 +40,13 @@ function initiateRemoteCache() {
   }
 }
 
+function initiateMemoryCache() {
+  return cacheManager.caching({
+    store: 'memory',
+    ttl: RESOLVED_URL_TTL
+  });
+}
+
 function cacheWrap(cache, key, method, options) {
   if (NO_CACHE || !cache) {
     return method();
@@ -57,20 +61,8 @@ function cacheWrapStream(id, method) {
 }
 
 function cacheWrapResolvedUrl(id, method) {
-  return cacheWrap(remoteCache, `${RESOLVED_URL_KEY_PREFIX}:${id}`, method, { ttl: RESOLVED_URL_TTL });
+  return cacheWrap(memoryCache, `${RESOLVED_URL_KEY_PREFIX}:${id}`, method, { ttl: RESOLVED_URL_TTL });
 }
 
-function cacheWrapProxy(id, method) {
-  return cacheWrap(remoteCache, `${PROXY_KEY_PREFIX}:${id}`, method, { ttl: PROXY_TTL });
-}
-
-function cacheUserAgent(id, method) {
-  return cacheWrap(remoteCache, `${USER_AGENT_KEY_PREFIX}:${id}`, method, { ttl: USER_AGENT_TTL });
-}
-
-function uncacheProxy(id) {
-  return remoteCache.del(`${PROXY_KEY_PREFIX}:${id}`);
-}
-
-module.exports = { cacheWrapStream, cacheWrapResolvedUrl, cacheWrapProxy, cacheUserAgent, uncacheProxy };
+module.exports = { cacheWrapStream, cacheWrapResolvedUrl };
 
diff --git a/addon/moch/moch.js b/addon/moch/moch.js
index 4bf1c6a..4836c4a 100644
--- a/addon/moch/moch.js
+++ b/addon/moch/moch.js
@@ -52,7 +52,7 @@ const MOCHS = {
 
 const unrestrictQueue = new namedQueue((task, callback) => task.method()
     .then(result => callback(false, result))
-    .catch((error => callback(error))));
+    .catch((error => callback(error))), 5);
 
 async function applyMochs(streams, config) {
   if (!streams || !streams.length || !Object.keys(MOCHS).find(moch => config[moch])) {
@@ -92,7 +92,7 @@ async function resolve(parameters) {
         console.warn(error);
         return StaticResponse.FAILED_UNEXPECTED;
       });
-
+  console.log(`Starting [${parameters.infoHash}] link resolve with queue size: ${unrestrictQueue.length()}`);
   return new Promise(((resolve, reject) => {
     unrestrictQueue.push({ id, method }, (error, result) => result ? resolve(result) : reject(error));
   }));