Index: tc8.5.x/trunk/java/org/apache/catalina/webresources/CachedResource.java
===================================================================
--- tc8.5.x/trunk/java/org/apache/catalina/webresources/CachedResource.java	(revision 1761338)
+++ tc8.5.x/trunk/java/org/apache/catalina/webresources/CachedResource.java	(working copy)
@@ -264,7 +264,7 @@
 
     @Override
     public InputStream getInputStream() {
-        byte[] content = cachedContent;
+        byte[] content = getContent();
         if (content == null) {
             // Can't cache InputStreams
             return webResource.getInputStream();
Index: trunk/java/org/apache/catalina/webresources/CachedResource.java
===================================================================
--- trunk/java/org/apache/catalina/webresources/CachedResource.java	(revision 1761338)
+++ trunk/java/org/apache/catalina/webresources/CachedResource.java	(working copy)
@@ -264,7 +264,7 @@
 
     @Override
     public InputStream getInputStream() {
-        byte[] content = cachedContent;
+        byte[] content = getContent();
         if (content == null) {
             // Can't cache InputStreams
             return webResource.getInputStream();