Expand test coverage for expiring old cache entries

Signed-off-by: Max Brunsfeld <mbrunsfeld@pivotal.io>