Cleaned up VideoReader slightly, improved cache
Some more cleaning up