Revert merge New disc cache API
Built the latest snapshot
Merge remote-tracking branch 'clone/master'