Add more cache for names