Fixed unittests
Fixed cache