Made commands use Cache.