BS-11328 - improve cache manager creation