Revert merge New disc cache API
Built the latest snapshot