diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java
index 3c2e00eb9..e31e74306 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java
+++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java
@@ -37,7 +37,7 @@ import org.apache.http.client.cache.HttpCacheUpdateCallback;
 /**
  * Basic {@link HttpCache} implementation backed by an instance of {@link LinkedHashMap}.
  * This cache does NOT deallocate resources associated with the cache entries. It is intended
- * for use with {@link BasicHttpCacheEntry} and similar.
+ * for use with {@link MemCacheEntry} and similar.
  *
  * @since 4.1
  */
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java
index f8f7e48bc..44998b772 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java
+++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java
@@ -50,7 +50,7 @@ class CacheEntryGenerator {
             Date responseDate,
             HttpResponse response,
             byte[] body) {
-        return new BasicHttpCacheEntry(requestDate,
+        return new MemCacheEntry(requestDate,
                               responseDate,
                               response.getStatusLine(),
                               response.getAllHeaders(),
@@ -69,7 +69,7 @@ class CacheEntryGenerator {
         while ((len = instream.read(buf)) != -1) {
             outstream.write(buf, 0, len);
         }
-        return new BasicHttpCacheEntry(
+        return new MemCacheEntry(
                 entry.getRequestDate(),
                 entry.getResponseDate(),
                 entry.getStatusLine(),
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
index 05542cf4a..6bf987dde 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
+++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
@@ -78,7 +78,7 @@ class CacheEntryUpdater {
         while ((len = instream.read(buf)) != -1) {
             outstream.write(buf, 0, len);
         }
-        HttpCacheEntry updated = new BasicHttpCacheEntry(requestDate, responseDate,
+        HttpCacheEntry updated = new MemCacheEntry(requestDate, responseDate,
                                             entry.getStatusLine(),
                                             mergedHeaders,
                                             outstream.toByteArray(),
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheEntry.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntry.java
similarity index 96%
rename from httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheEntry.java
rename to httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntry.java
index 870a12f42..4b809bdc2 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheEntry.java
+++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntry.java
@@ -42,13 +42,13 @@ import org.apache.http.client.cache.Resource;
  * explicit deallocation.
  */
 @Immutable
-public class BasicHttpCacheEntry extends HttpCacheEntry {
+public class MemCacheEntry extends HttpCacheEntry {
 
     private static final long serialVersionUID = -8464486112875881235L;
 
     private final byte[] body;
 
-    public BasicHttpCacheEntry(
+    public MemCacheEntry(
             final Date requestDate,
             final Date responseDate,
             final StatusLine statusLine,
diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/CacheEntry.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/CacheEntry.java
index 4fa270b01..ae93e3de5 100644
--- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/CacheEntry.java
+++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/CacheEntry.java
@@ -30,7 +30,7 @@ import java.util.Date;
 
 import org.apache.http.Header;
 
-public class CacheEntry extends BasicHttpCacheEntry {
+public class CacheEntry extends MemCacheEntry {
 
     private static final long serialVersionUID = 7964121802841871079L;
 
diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCache.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCache.java
index ef34461ca..bd5cb3095 100644
--- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCache.java
+++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCache.java
@@ -144,7 +144,7 @@ public class TestResponseCache {
         cache.updateEntry("foo", new HttpCacheUpdateCallback() {
 
             public HttpCacheEntry update(HttpCacheEntry existing) {
-                HttpCacheEntry updated = new BasicHttpCacheEntry(
+                HttpCacheEntry updated = new MemCacheEntry(
                         existing.getRequestDate(),
                         existing.getRequestDate(),
                         existing.getStatusLine(),