DOL-98 : Added code to handle invalidate handler.