Added proxy-side buffering