Added command caching