Fixing cache crashing with plain requests