Simplified cache logic