Caching shell is updated after destroy

Also includes a bug fix where the stub model saved the after touch
callbacks to the wrong variable.
Merge pull request #164 from Oktavilla/caching-shell-touch-after-destroy

Caching shell is updated after destroy