Merge "blast: implicitly cache buffers"