MDL-38111 Changed cache to MUC, code improvements