Fixed a missing super call and only invalidate when necessary