cleaning up controller adding invalidation support.