Make sure EntryIterator doesn't return expired entries

We should make sure that the entry iterator doesn't return entries that have expired. Since entries can sit in the data container while expired we need to make sure to ignore those.