Is there a better place to wrap that would ensure the context was populated for both views and handlers?