Enforce ConditionalContentCachingResponseWrapper in ShallowEtagHeader…

…Filter

Closes gh-24976

spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java

@@ -99,7 +99,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 			throws ServletException, IOException {
 
 		HttpServletResponse responseToUse = response;
-		if (!isAsyncDispatch(request) && !(response instanceof ContentCachingResponseWrapper)) {
+		if (!isAsyncDispatch(request) && !(response instanceof ConditionalContentCachingResponseWrapper)) {
 			responseToUse = new ConditionalContentCachingResponseWrapper(response, request);
 		}
 
@@ -111,10 +111,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 	}
 
 	private void updateResponse(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
-		ContentCachingResponseWrapper wrapper =
-				WebUtils.getNativeResponse(response, ContentCachingResponseWrapper.class);
-
+		ConditionalContentCachingResponseWrapper wrapper =
+				WebUtils.getNativeResponse(response, ConditionalContentCachingResponseWrapper.class);
 		Assert.notNull(wrapper, "ContentCachingResponseWrapper not found");
 		HttpServletResponse rawResponse = (HttpServletResponse) wrapper.getResponse();
 
@@ -219,7 +217,6 @@ private static class ConditionalContentCachingResponseWrapper extends ContentCac
 
 		private final HttpServletRequest request;
 
-
 		ConditionalContentCachingResponseWrapper(HttpServletResponse response, HttpServletRequest request) {
 			super(response);
 			this.request = request;