CLC-3762 Avoid class-object storage of current term
Merge pull request #2576 from raydavis/raywip

CLC-3762 Avoid class-object storage of current term