More reliable stream buffering