Merge "Maintain the trigger cache after reconfiguring"