mamh-java
diff --git a/‎src/main/java/org/kohsuke/github/extras/OkHttpConnector.java‎
Lines changed: 12 additions & 1 deletion b/‎src/main/java/org/kohsuke/github/extras/OkHttpConnector.java‎
Lines changed: 12 additions & 1 deletion
diff --git a/‎src/test/java/org/kohsuke/github/OkHttpConnectorTest.java‎
Lines changed: 37 additions & 0 deletions b/‎src/test/java/org/kohsuke/github/OkHttpConnectorTest.java‎
Lines changed: 37 additions & 0 deletions
@@ -41,7 +41,18 @@ public OkHttpConnector(OkUrlFactory urlFactory) {
     }
 
     public HttpURLConnection connect(URL url) throws IOException {
-        return urlFactory.open(url);
+        HttpURLConnection urlConnection = urlFactory.open(url);
+        if (urlFactory.client() != null && urlFactory.client().getCache() != null) {
+            // By default OkHttp honors max-age, meaning it will use local cache
+            // without checking the network within that time frame.
+            // However, that can result in stale data being returned during that time so
+            // we force network-based checking no matter how often the query is made.
+            // OkHttp still automatically does ETag checking and returns cached data when
+            // GitHub reports 304, but those do not count against rate limit.
+            urlConnection.setRequestProperty("Cache-Control", "max-age=0");
+        }
+
+        return urlConnection;
     }
 
     /** Returns TLSv1.2 only SSL Socket Factory. */
 
@@ -0,0 +1,37 @@
+package org.kohsuke.github;
+
+import com.squareup.okhttp.OkUrlFactory;
+import com.squareup.okhttp.Cache;
+import com.squareup.okhttp.OkHttpClient;
+import org.apache.commons.io.FileUtils;
+import org.kohsuke.github.extras.OkHttpConnector;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author Liam Newman
+ */
+public abstract class OkHttpConnectorTest extends AbstractGitHubApiWireMockTest {
+
+    protected GitHubBuilder getGitHubBuilder() {
+        OkHttpClient client = new OkHttpClient();
+
+        File cacheDir = new File("target/cache/" + baseFilesClassPath + "/" +  githubApi.getMethodName());
+        cacheDir.mkdirs();
+        try {
+            FileUtils.cleanDirectory(cacheDir);
+        } catch (IOException e) {}
+        Cache cache = new Cache(cacheDir, 100 * 1024L * 1024L);
+
+        client.setCache(cache);
+
+        return super.getGitHubBuilder()
+            .withConnector(new OkHttpConnector(new OkUrlFactory(client)));
+    }
+
+    // TODO: Show the same actions with Default, OkHttp, and OkHttp with Cache
+    // Verify how each behaves
+
+
+}