Avoid rebuilding context so much