Got rid of command caching code