Caching shell is updated after destroy

Also includes a bug fix where the stub model saved the after touch callbacks to the wrong variable.