Cache form choices and minor fixes