More bug fixes to caching subview_watchable