Make buffering optional, but default it to on because that is how the content methods used to work.