Hmm, that's not my point. I don't think it's a good idea to have two things, one InternalEntryFactory and another InternalCacheEntryFactory. Can you tell me the difference between the two? We should have a single ICEF. I don't mind which one, but a single entity as such.