DF-5184 fixed cached values