new invalidate support