MDL-31885 Changed cache to MUC, code improvements