Added disk based caching.