Revert "Cache test Invocations per class, and use associated object insted of the static variable"
Revert "Cache test Invocations per class, and use associated object insted of the static variable"

This reverts commit b06edaa3b6422809d308a66f2541b49296cb7bc7.

PaulTaykalo/Kiwi,PaulTaykalo/Kiwi,PaulTaykalo/Kiwi,PaulTaykalo/Kiwi