8170814: Reuse cache entries (part II)

Reviewed-by: dfuchs
2 files changed