- Improved caching current buffer.