Revert "Revert "Added Cache-Control headers""

This reverts commit dfee1b5e2bc4c5b01f5c203e07e031fc1d52849c.