More tweaks to collection cache expiration

More tweaks to collection cache expiration