Remove expiryEvaluator from bottleCache so that I can merge