Closed #2 and cache driver improvements