Fix cache implementation, pull blitbuffer fix