Change EntryIterator return type to be CacheEntry

Currently the entry retriever pieces return a Map.Entry. However end users may need the metadata along with that. We need to change this to return CacheEntry instead so the Metadata is available.