Patch fix DO bugs with a new cache feature