Merge Vary headers on cached responses

The cache/.htaccess mechanism should actually be moved into
the apache2 config, instead of the current hackish solution...