diff --git a/mercurial/revlog.py b/mercurial/revlog.py
index 1a78585e3a..a93defb2aa 100644
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -1267,7 +1267,9 @@ class revlog(object):
             return ""
         if self._cache:
             if self._cache[0] == node:
-                return self._cache[2]
+                # _cache only stores rawtext
+                if raw:
+                    return self._cache[2]
             cachedrev = self._cache[1]
 
         # look up what we need to read
@@ -1294,7 +1296,7 @@ class revlog(object):
         if validatehash:
             self.checkhash(text, node, rev=rev)
 
-        self._cache = (node, rev, text)
+        self._cache = (node, rev, rawtext)
         return text
 
     def hash(self, text, p1, p2):
diff --git a/tests/test-revlog-raw.py.out b/tests/test-revlog-raw.py.out
index 2dd77349fe..8f8d8e72b2 100644
--- a/tests/test-revlog-raw.py.out
+++ b/tests/test-revlog-raw.py.out
@@ -1 +1 @@
-abort: rev 5: wrong text
+abort: crashed: integrity check failed on _testrevlog.i:11