Use new cache handler