fixed commands and caching