Fix minor cache conflict issue