Refactored cache fallback