Return to using cached-context
Correct sources index