Added more headers to be sent with a cached response
IDE changes
Merge branch 'feature/caching' into develop