Enhance cache lang management