Cached response fix