Will/rubric options ids optimization

More cleanup for AI grading: caching for the new rubric method and some test reorg.