Fixed entity cache auto clear issue due to inconsistent cache names after recent change