diff --git a/docs/0.10/debugging.html b/docs/0.10/debugging.html
index e27aabc3d86..7e830547ab2 100644
--- a/docs/0.10/debugging.html
+++ b/docs/0.10/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.10/debugging/index.html b/docs/0.10/debugging/index.html
index e27aabc3d86..7e830547ab2 100644
--- a/docs/0.10/debugging/index.html
+++ b/docs/0.10/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.11/debugging.html b/docs/0.11/debugging.html
index 7ac0c1364ff..173cda4179e 100644
--- a/docs/0.11/debugging.html
+++ b/docs/0.11/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.11/debugging/index.html b/docs/0.11/debugging/index.html
index 7ac0c1364ff..173cda4179e 100644
--- a/docs/0.11/debugging/index.html
+++ b/docs/0.11/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.12/debugging.html b/docs/0.12/debugging.html
index bbbb0437a59..ceaa516047c 100644
--- a/docs/0.12/debugging.html
+++ b/docs/0.12/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.12/debugging/index.html b/docs/0.12/debugging/index.html
index bbbb0437a59..ceaa516047c 100644
--- a/docs/0.12/debugging/index.html
+++ b/docs/0.12/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.13/debugging.html b/docs/0.13/debugging.html
index 4cede41bc2c..f8546edf86c 100644
--- a/docs/0.13/debugging.html
+++ b/docs/0.13/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.13/debugging/index.html b/docs/0.13/debugging/index.html
index 4cede41bc2c..f8546edf86c 100644
--- a/docs/0.13/debugging/index.html
+++ b/docs/0.13/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.14/debugging.html b/docs/0.14/debugging.html
index f4489e29964..d9799b1a458 100644
--- a/docs/0.14/debugging.html
+++ b/docs/0.14/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.14/debugging/index.html b/docs/0.14/debugging/index.html
index f4489e29964..d9799b1a458 100644
--- a/docs/0.14/debugging/index.html
+++ b/docs/0.14/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.15/debugging.html b/docs/0.15/debugging.html
index 0833ddffa16..fb8d0765d55 100644
--- a/docs/0.15/debugging.html
+++ b/docs/0.15/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.15/debugging/index.html b/docs/0.15/debugging/index.html
index 0833ddffa16..fb8d0765d55 100644
--- a/docs/0.15/debugging/index.html
+++ b/docs/0.15/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.16/debugging.html b/docs/0.16/debugging.html
index d425e501244..f7869cc1778 100644
--- a/docs/0.16/debugging.html
+++ b/docs/0.16/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.16/debugging/index.html b/docs/0.16/debugging/index.html
index d425e501244..f7869cc1778 100644
--- a/docs/0.16/debugging/index.html
+++ b/docs/0.16/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.17/debugging.html b/docs/0.17/debugging.html
index a4973129d55..2f04a065862 100644
--- a/docs/0.17/debugging.html
+++ b/docs/0.17/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.17/debugging/index.html b/docs/0.17/debugging/index.html
index a4973129d55..2f04a065862 100644
--- a/docs/0.17/debugging/index.html
+++ b/docs/0.17/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.18/debugging.html b/docs/0.18/debugging.html
index 2daf2eeb26d..bda7eef8249 100644
--- a/docs/0.18/debugging.html
+++ b/docs/0.18/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.18/debugging/index.html b/docs/0.18/debugging/index.html
index 2daf2eeb26d..bda7eef8249 100644
--- a/docs/0.18/debugging/index.html
+++ b/docs/0.18/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.19/debugging.html b/docs/0.19/debugging.html
index e4939c0d4bd..56f1be79628 100644
--- a/docs/0.19/debugging.html
+++ b/docs/0.19/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.19/debugging/index.html b/docs/0.19/debugging/index.html
index e4939c0d4bd..56f1be79628 100644
--- a/docs/0.19/debugging/index.html
+++ b/docs/0.19/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.20/debugging.html b/docs/0.20/debugging.html
index 6f3612e4dbc..6473e30c4c0 100644
--- a/docs/0.20/debugging.html
+++ b/docs/0.20/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.20/debugging/index.html b/docs/0.20/debugging/index.html
index 6f3612e4dbc..6473e30c4c0 100644
--- a/docs/0.20/debugging/index.html
+++ b/docs/0.20/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.21/debugging.html b/docs/0.21/debugging.html
index 6fcc2c190e7..aa19f91bdff 100644
--- a/docs/0.21/debugging.html
+++ b/docs/0.21/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.21/debugging/index.html b/docs/0.21/debugging/index.html
index 6fcc2c190e7..aa19f91bdff 100644
--- a/docs/0.21/debugging/index.html
+++ b/docs/0.21/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.22/debugging.html b/docs/0.22/debugging.html
index 2048b0237fb..358af369c84 100644
--- a/docs/0.22/debugging.html
+++ b/docs/0.22/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.22/debugging/index.html b/docs/0.22/debugging/index.html
index 2048b0237fb..358af369c84 100644
--- a/docs/0.22/debugging/index.html
+++ b/docs/0.22/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.23/debugging.html b/docs/0.23/debugging.html
index 2d833255813..47fcc392a59 100644
--- a/docs/0.23/debugging.html
+++ b/docs/0.23/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.23/debugging/index.html b/docs/0.23/debugging/index.html
index 2d833255813..47fcc392a59 100644
--- a/docs/0.23/debugging/index.html
+++ b/docs/0.23/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.24/debugging.html b/docs/0.24/debugging.html
index 3019be7d20e..bf951571521 100644
--- a/docs/0.24/debugging.html
+++ b/docs/0.24/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.24/debugging/index.html b/docs/0.24/debugging/index.html
index 3019be7d20e..bf951571521 100644
--- a/docs/0.24/debugging/index.html
+++ b/docs/0.24/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.25/debugging.html b/docs/0.25/debugging.html
index 9f500fb1b3c..58d6a31f0bb 100644
--- a/docs/0.25/debugging.html
+++ b/docs/0.25/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.25/debugging/index.html b/docs/0.25/debugging/index.html
index 9f500fb1b3c..58d6a31f0bb 100644
--- a/docs/0.25/debugging/index.html
+++ b/docs/0.25/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.26/debugging.html b/docs/0.26/debugging.html
index 435fbe1ac07..08aaac71f7e 100644
--- a/docs/0.26/debugging.html
+++ b/docs/0.26/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.26/debugging/index.html b/docs/0.26/debugging/index.html
index 435fbe1ac07..08aaac71f7e 100644
--- a/docs/0.26/debugging/index.html
+++ b/docs/0.26/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.27/debugging.html b/docs/0.27/debugging.html
index 21fb8447fdd..a41be569616 100644
--- a/docs/0.27/debugging.html
+++ b/docs/0.27/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.27/debugging/index.html b/docs/0.27/debugging/index.html
index 21fb8447fdd..a41be569616 100644
--- a/docs/0.27/debugging/index.html
+++ b/docs/0.27/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.28/debugging.html b/docs/0.28/debugging.html
index b78469e701a..9b25ba8fdff 100644
--- a/docs/0.28/debugging.html
+++ b/docs/0.28/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.28/debugging/index.html b/docs/0.28/debugging/index.html
index b78469e701a..9b25ba8fdff 100644
--- a/docs/0.28/debugging/index.html
+++ b/docs/0.28/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.29/debugging.html b/docs/0.29/debugging.html
index b4ead3f4793..ad70bb68b51 100644
--- a/docs/0.29/debugging.html
+++ b/docs/0.29/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.29/debugging/index.html b/docs/0.29/debugging/index.html
index b4ead3f4793..ad70bb68b51 100644
--- a/docs/0.29/debugging/index.html
+++ b/docs/0.29/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.30/debugging.html b/docs/0.30/debugging.html
index e2fa41af761..b835e70ae4a 100644
--- a/docs/0.30/debugging.html
+++ b/docs/0.30/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.30/debugging/index.html b/docs/0.30/debugging/index.html
index e2fa41af761..b835e70ae4a 100644
--- a/docs/0.30/debugging/index.html
+++ b/docs/0.30/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.31/debugging.html b/docs/0.31/debugging.html
index 7a02cd234f6..a0d4e0eb7bc 100644
--- a/docs/0.31/debugging.html
+++ b/docs/0.31/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.31/debugging/index.html b/docs/0.31/debugging/index.html
index 7a02cd234f6..a0d4e0eb7bc 100644
--- a/docs/0.31/debugging/index.html
+++ b/docs/0.31/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.32/debugging.html b/docs/0.32/debugging.html
index 05206b348c5..9a1b30f89a9 100644
--- a/docs/0.32/debugging.html
+++ b/docs/0.32/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.32/debugging/index.html b/docs/0.32/debugging/index.html
index 05206b348c5..9a1b30f89a9 100644
--- a/docs/0.32/debugging/index.html
+++ b/docs/0.32/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.33/debugging.html b/docs/0.33/debugging.html
index 2d60b8c8150..266482f1e8b 100644
--- a/docs/0.33/debugging.html
+++ b/docs/0.33/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.33/debugging/index.html b/docs/0.33/debugging/index.html
index 2d60b8c8150..266482f1e8b 100644
--- a/docs/0.33/debugging/index.html
+++ b/docs/0.33/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.34/debugging.html b/docs/0.34/debugging.html
index 10b23c565e0..671b88084c9 100644
--- a/docs/0.34/debugging.html
+++ b/docs/0.34/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.34/debugging/index.html b/docs/0.34/debugging/index.html
index 10b23c565e0..671b88084c9 100644
--- a/docs/0.34/debugging/index.html
+++ b/docs/0.34/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.35/debugging.html b/docs/0.35/debugging.html
index dae525e8f10..f9f19f07b65 100644
--- a/docs/0.35/debugging.html
+++ b/docs/0.35/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.35/debugging/index.html b/docs/0.35/debugging/index.html
index dae525e8f10..f9f19f07b65 100644
--- a/docs/0.35/debugging/index.html
+++ b/docs/0.35/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.36/debugging.html b/docs/0.36/debugging.html
index 60f3adfa7ec..203f0cc10b8 100644
--- a/docs/0.36/debugging.html
+++ b/docs/0.36/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.36/debugging/index.html b/docs/0.36/debugging/index.html
index 60f3adfa7ec..203f0cc10b8 100644
--- a/docs/0.36/debugging/index.html
+++ b/docs/0.36/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.37/debugging.html b/docs/0.37/debugging.html
index aed5c4042fe..21939dd6eaa 100644
--- a/docs/0.37/debugging.html
+++ b/docs/0.37/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.37/debugging/index.html b/docs/0.37/debugging/index.html
index aed5c4042fe..21939dd6eaa 100644
--- a/docs/0.37/debugging/index.html
+++ b/docs/0.37/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.38/debugging.html b/docs/0.38/debugging.html
index 76ab236d531..e7e66babfd6 100644
--- a/docs/0.38/debugging.html
+++ b/docs/0.38/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.38/debugging/index.html b/docs/0.38/debugging/index.html
index 76ab236d531..e7e66babfd6 100644
--- a/docs/0.38/debugging/index.html
+++ b/docs/0.38/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.39/debugging.html b/docs/0.39/debugging.html
index df56ed337e2..c1e8dbbe48c 100644
--- a/docs/0.39/debugging.html
+++ b/docs/0.39/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.39/debugging/index.html b/docs/0.39/debugging/index.html
index df56ed337e2..c1e8dbbe48c 100644
--- a/docs/0.39/debugging/index.html
+++ b/docs/0.39/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.40/debugging.html b/docs/0.40/debugging.html
index e208b268f7d..e53c92c9ef2 100644
--- a/docs/0.40/debugging.html
+++ b/docs/0.40/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.40/debugging/index.html b/docs/0.40/debugging/index.html
index e208b268f7d..e53c92c9ef2 100644
--- a/docs/0.40/debugging/index.html
+++ b/docs/0.40/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.41/debugging.html b/docs/0.41/debugging.html
index dc8fb2d3f6d..2c8baaa1521 100644
--- a/docs/0.41/debugging.html
+++ b/docs/0.41/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.41/debugging/index.html b/docs/0.41/debugging/index.html
index dc8fb2d3f6d..2c8baaa1521 100644
--- a/docs/0.41/debugging/index.html
+++ b/docs/0.41/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.42/debugging.html b/docs/0.42/debugging.html
index 52c9cfccc24..4df05587d64 100644
--- a/docs/0.42/debugging.html
+++ b/docs/0.42/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.42/debugging/index.html b/docs/0.42/debugging/index.html
index 52c9cfccc24..4df05587d64 100644
--- a/docs/0.42/debugging/index.html
+++ b/docs/0.42/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.43/debugging.html b/docs/0.43/debugging.html
index a892253ec98..33d579be856 100644
--- a/docs/0.43/debugging.html
+++ b/docs/0.43/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.43/debugging/index.html b/docs/0.43/debugging/index.html
index a892253ec98..33d579be856 100644
--- a/docs/0.43/debugging/index.html
+++ b/docs/0.43/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.44/debugging.html b/docs/0.44/debugging.html
index 252190e1e09..e7ec45e9cab 100644
--- a/docs/0.44/debugging.html
+++ b/docs/0.44/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.44/debugging/index.html b/docs/0.44/debugging/index.html
index 252190e1e09..e7ec45e9cab 100644
--- a/docs/0.44/debugging/index.html
+++ b/docs/0.44/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.45/debugging.html b/docs/0.45/debugging.html
index c17ca6d6372..26c4637fe8e 100644
--- a/docs/0.45/debugging.html
+++ b/docs/0.45/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.45/debugging/index.html b/docs/0.45/debugging/index.html
index c17ca6d6372..26c4637fe8e 100644
--- a/docs/0.45/debugging/index.html
+++ b/docs/0.45/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.46/debugging.html b/docs/0.46/debugging.html
index ba176e5bdd1..6e8f8bad85a 100644
--- a/docs/0.46/debugging.html
+++ b/docs/0.46/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.46/debugging/index.html b/docs/0.46/debugging/index.html
index ba176e5bdd1..6e8f8bad85a 100644
--- a/docs/0.46/debugging/index.html
+++ b/docs/0.46/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.47/debugging.html b/docs/0.47/debugging.html
index 13ac6ea4497..5fe874b0985 100644
--- a/docs/0.47/debugging.html
+++ b/docs/0.47/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.47/debugging/index.html b/docs/0.47/debugging/index.html
index 13ac6ea4497..5fe874b0985 100644
--- a/docs/0.47/debugging/index.html
+++ b/docs/0.47/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.48/debugging.html b/docs/0.48/debugging.html
index b2e2cf0a86b..8ad1d339d34 100644
--- a/docs/0.48/debugging.html
+++ b/docs/0.48/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.48/debugging/index.html b/docs/0.48/debugging/index.html
index b2e2cf0a86b..8ad1d339d34 100644
--- a/docs/0.48/debugging/index.html
+++ b/docs/0.48/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.49/debugging.html b/docs/0.49/debugging.html
index 5757cc52d2b..717b943670f 100644
--- a/docs/0.49/debugging.html
+++ b/docs/0.49/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.49/debugging/index.html b/docs/0.49/debugging/index.html
index 5757cc52d2b..717b943670f 100644
--- a/docs/0.49/debugging/index.html
+++ b/docs/0.49/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.5/debugging.html b/docs/0.5/debugging.html
index a2a071fa91d..0837809e4b2 100644
--- a/docs/0.5/debugging.html
+++ b/docs/0.5/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.5/debugging/index.html b/docs/0.5/debugging/index.html
index a2a071fa91d..0837809e4b2 100644
--- a/docs/0.5/debugging/index.html
+++ b/docs/0.5/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.50/debugging.html b/docs/0.50/debugging.html
index a869af87386..8338c988155 100644
--- a/docs/0.50/debugging.html
+++ b/docs/0.50/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.50/debugging/index.html b/docs/0.50/debugging/index.html
index a869af87386..8338c988155 100644
--- a/docs/0.50/debugging/index.html
+++ b/docs/0.50/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.51/debugging.html b/docs/0.51/debugging.html
index 2c22373dc47..40103b88076 100644
--- a/docs/0.51/debugging.html
+++ b/docs/0.51/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.51/debugging/index.html b/docs/0.51/debugging/index.html
index 2c22373dc47..40103b88076 100644
--- a/docs/0.51/debugging/index.html
+++ b/docs/0.51/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.52/debugging.html b/docs/0.52/debugging.html
index 039c2cf4d9a..a2484ecd821 100644
--- a/docs/0.52/debugging.html
+++ b/docs/0.52/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.52/debugging/index.html b/docs/0.52/debugging/index.html
index 039c2cf4d9a..a2484ecd821 100644
--- a/docs/0.52/debugging/index.html
+++ b/docs/0.52/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.53/debugging.html b/docs/0.53/debugging.html
index a9887a83457..e044cfa6652 100644
--- a/docs/0.53/debugging.html
+++ b/docs/0.53/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.53/debugging/index.html b/docs/0.53/debugging/index.html
index a9887a83457..e044cfa6652 100644
--- a/docs/0.53/debugging/index.html
+++ b/docs/0.53/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.54/debugging.html b/docs/0.54/debugging.html
index 6139e3d09f9..2b9f3dd50e4 100644
--- a/docs/0.54/debugging.html
+++ b/docs/0.54/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.54/debugging/index.html b/docs/0.54/debugging/index.html
index 6139e3d09f9..2b9f3dd50e4 100644
--- a/docs/0.54/debugging/index.html
+++ b/docs/0.54/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.55/debugging.html b/docs/0.55/debugging.html
index 11468328a99..15aec0360f1 100644
--- a/docs/0.55/debugging.html
+++ b/docs/0.55/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.55/debugging/index.html b/docs/0.55/debugging/index.html
index 11468328a99..15aec0360f1 100644
--- a/docs/0.55/debugging/index.html
+++ b/docs/0.55/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.6/debugging.html b/docs/0.6/debugging.html
index a55721f9270..ce3ece6d360 100644
--- a/docs/0.6/debugging.html
+++ b/docs/0.6/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.6/debugging/index.html b/docs/0.6/debugging/index.html
index a55721f9270..ce3ece6d360 100644
--- a/docs/0.6/debugging/index.html
+++ b/docs/0.6/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.7/debugging.html b/docs/0.7/debugging.html
index d4ae90f1076..2b473e90846 100644
--- a/docs/0.7/debugging.html
+++ b/docs/0.7/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.7/debugging/index.html b/docs/0.7/debugging/index.html
index d4ae90f1076..2b473e90846 100644
--- a/docs/0.7/debugging/index.html
+++ b/docs/0.7/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.8/debugging.html b/docs/0.8/debugging.html
index 0b95afefcac..77395588852 100644
--- a/docs/0.8/debugging.html
+++ b/docs/0.8/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.8/debugging/index.html b/docs/0.8/debugging/index.html
index 0b95afefcac..77395588852 100644
--- a/docs/0.8/debugging/index.html
+++ b/docs/0.8/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.9/debugging.html b/docs/0.9/debugging.html
index 892d4a16f00..924bccb2bab 100644
--- a/docs/0.9/debugging.html
+++ b/docs/0.9/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/0.9/debugging/index.html b/docs/0.9/debugging/index.html
index 892d4a16f00..924bccb2bab 100644
--- a/docs/0.9/debugging/index.html
+++ b/docs/0.9/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/debugging.html b/docs/debugging.html
index f5b8c41404c..878a848e566 100644
--- a/docs/debugging.html
+++ b/docs/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/debugging/index.html b/docs/debugging/index.html
index f5b8c41404c..878a848e566 100644
--- a/docs/debugging/index.html
+++ b/docs/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/next/debugging.html b/docs/next/debugging.html
index ae10c68521c..5df7cecc662 100644
--- a/docs/next/debugging.html
+++ b/docs/next/debugging.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>
diff --git a/docs/next/debugging/index.html b/docs/next/debugging/index.html
index ae10c68521c..5df7cecc662 100644
--- a/docs/next/debugging/index.html
+++ b/docs/next/debugging/index.html
@@ -169,12 +169,15 @@ YellowBox.ignoreWarnings([<span class="hljs-string">'Warning: ...'</span>]);
     }
 
     <span class="hljs-function"><span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">void</span> <span class="hljs-title">addInterceptor</span><span class="hljs-params">()</span> </span>{
-      OkHttpClient client = OkHttpClientProvider.getOkHttpClient()
-             .newBuilder()
-             .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
-             .build();
-
-      OkHttpClientProvider.replaceOkHttpClient(client);
+      <span class="hljs-keyword">final</span> OkHttpClient baseClient = OkHttpClientProvider.createClient();
+      OkHttpClientProvider.setOkHttpClientFactory(<span class="hljs-keyword">new</span> OkHttpClientFactory() {
+        <span class="hljs-meta">@Override</span>
+        <span class="hljs-function"><span class="hljs-keyword">public</span> OkHttpClient <span class="hljs-title">createNewNetworkModuleClient</span><span class="hljs-params">()</span> </span>{
+          <span class="hljs-keyword">return</span> baseClient.newBuilder()
+              .addNetworkInterceptor(<span class="hljs-keyword">new</span> StethoInterceptor())
+              .build();
+        }
+      });
     }
 }
 </code></pre></li>