- Improved the caching code, this will now effectively cache to disk.