Refactor to a single cache item request