Add back in cache expiry but not using a filter