More tweaks to collection cache expiration
Merge pull request #1529 from elzj/redis_index_keys

More tweaks to collection cache expiration