INT-3321 Polishing

Mock the operations cache; remove static method.