ParamCache
fixes
fixes
tests refactoring