Issue 31 cache raw buffers