Refactoring. Allow setting of alternative disk caching directory.