ticket:262 fixed unit tests after cache update
ticket:262 fixed t262 merge conflicts