Merge "Revert "Cache and uncache buffers in the same transaction""