please review: Ticket 47750 - improve entry cache handling