update
remove cache in some flow
merge code