Branch to add HTTP cache-control headers