fix monitoring & cache