Modify command creation and caching.