CEDEX-5383: Remove class static variables, replace w/local variables to avoid thread collision