Don't cache the main thunk and add test case