#73 Gutted the old disk caching mechanism