some cleaner logic to allow for #2424, which should also work when video
buffers start accumulating in the cache on slower machines.