Cleanup based on review
still discussing `withEvictionHandler`