Execution plan persistence unification