Feature/per request fallback to cache