diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 15f276984..648e4e768 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>2.7.0</version>
+      <version>2.7.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
diff --git a/core/build.gradle b/core/build.gradle
index 27498d2ad..7b498ae81 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -5,6 +5,6 @@ sourceCompatibility = 1.6
 dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
-    testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
     testCompile 'com.google.code.gson:gson:2.5' // for example
 }
diff --git a/httpclient/build.gradle b/httpclient/build.gradle
index 575b09205..35e0acbb6 100644
--- a/httpclient/build.gradle
+++ b/httpclient/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     compile 'org.apache.httpcomponents:httpclient:4.5.1'
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
-    testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
     testCompile project(':feign-core').sourceSets.test.output // for assertions
 }
diff --git a/hystrix/build.gradle b/hystrix/build.gradle
index f24961902..3044049eb 100644
--- a/hystrix/build.gradle
+++ b/hystrix/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile 'com.netflix.hystrix:hystrix-core:1.4.21'
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
-    testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
     testCompile project(':feign-gson')
     testCompile project(':feign-core').sourceSets.test.output // for assertions
 }
diff --git a/hystrix/src/main/java/feign/hystrix/HystrixInvocationHandler.java b/hystrix/src/main/java/feign/hystrix/HystrixInvocationHandler.java
index 68c80e9c2..284c87faa 100644
--- a/hystrix/src/main/java/feign/hystrix/HystrixInvocationHandler.java
+++ b/hystrix/src/main/java/feign/hystrix/HystrixInvocationHandler.java
@@ -33,10 +33,10 @@
 
 final class HystrixInvocationHandler implements InvocationHandler {
 
-  private final Target target;
+  private final Target<?> target;
   private final Map<Method, MethodHandler> dispatch;
 
-  HystrixInvocationHandler(Target target, Map<Method, MethodHandler> dispatch) {
+  HystrixInvocationHandler(Target<?> target, Map<Method, MethodHandler> dispatch) {
     this.target = checkNotNull(target, "target");
     this.dispatch = checkNotNull(dispatch, "dispatch");
   }
diff --git a/okhttp/build.gradle b/okhttp/build.gradle
index b4f859941..2ea52dfae 100644
--- a/okhttp/build.gradle
+++ b/okhttp/build.gradle
@@ -4,9 +4,9 @@ sourceCompatibility = 1.6
 
 dependencies {
     compile project(':feign-core')
-    compile 'com.squareup.okhttp:okhttp:2.7.0'
+    compile 'com.squareup.okhttp:okhttp:2.7.1'
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
-    testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
     testCompile project(':feign-core').sourceSets.test.output // for assertions
 }
diff --git a/ribbon/build.gradle b/ribbon/build.gradle
index 673073544..438d14f06 100644
--- a/ribbon/build.gradle
+++ b/ribbon/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     compile 'com.netflix.ribbon:ribbon-loadbalancer:2.1.1'
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
-    testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
     testCompile project(':feign-core').sourceSets.test.output
 }