Added filter to set cache headers
Merge remote-tracking branch 'origin/master'