Introduce getWithHeader, the old getBuffer.
Replace getBuffer in a TODO code with getWithBuffer. This will probably
be done in a different way anyway.