Added naughty caches