8163520: Reuse cache entries

Reviewed-by: chegar, aefimov
4 files changed