Improve make_cache_current_buffer()