Change Cache accessors to use same code path