LYFT-14491 - clean up naming, add support for not getting objects from cache