Refs #369: Fix header handling during cache revalidation.
Merge pull request #417 from whatthejeff/fix-cache

Refs #369: Fix header handling during cache revalidation.