some tweaks to prepare to implement cache expiration

no functional changes yet
less verbose