update cache api
fix conflict