This could be messy... Can't we improve the implementation of Stash somehow?