I'm busy adapting @snatchev's "header cache" to current master so we can finally include whatever we want (within limits) in tests.