Adding expiring buffer