Added expiry to cached items