Remove ContentCache dependence (useless)