minor refactor and add update cache shortcut