diff --git a/lib/common/browser.rb b/lib/common/browser.rb
index 1d1ea9a4..eb5e8349 100644
--- a/lib/common/browser.rb
+++ b/lib/common/browser.rb
@@ -31,13 +31,11 @@ class Browser
       override_config_with_options(options)
     end
 
-    @hydra = Typhoeus::Hydra.new(
-      max_concurrency: @max_threads,
-      #connecttimeout: @request_timeout
-    )
+    @hydra = Typhoeus::Hydra.new(max_concurrency: @max_threads)
 
     # TODO : add an argument for the cache dir instead of using a constant
-    @cache = TyphoeusCache.new(CACHE_DIR + '/browser')
+    @cache_dir = CACHE_DIR + '/browser'
+    @cache = TyphoeusCache.new(@cache_dir)
 
     @cache.clean
 
@@ -183,8 +181,8 @@ class Browser
     params.merge!(ssl_verifypeer: false)
     params.merge!(ssl_verifyhost: 0)
 
-    params.merge!(cookie_jar: CACHE_DIR + '/cookie-jar')
-    params.merge!(cookie_file: CACHE_DIR + '/cookie-jar')
+    params.merge!(cookie_jar: @cache_dir + '/cookie-jar')
+    params.merge!(cookie_file: @cache_dir + '/cookie-jar')
 
     params
   end
diff --git a/spec/lib/common/browser_spec.rb b/spec/lib/common/browser_spec.rb
index 562b22c4..e06e649f 100644
--- a/spec/lib/common/browser_spec.rb
+++ b/spec/lib/common/browser_spec.rb
@@ -261,7 +261,7 @@ describe Browser do
 
   describe '#merge_request_params' do
     let(:params)              { {} }
-    let(:cookie_jar)          { CACHE_DIR + '/cookie-jar' }
+    let(:cookie_jar)          { CACHE_DIR + '/browser/cookie-jar' }
     let(:default_expectation) {
       {
         cache_ttl: 250,