Refactor commands to use a CacheClearer service