Fix some instances of ExpiringCache not expiring cache items