Yet another rendering tweak. Caching the final buffers.
Merge branch 'editor'