Added further cache checks