Update to vary based on header as well as body