Fix caching issue for non-html