Added support for caching headers as well