Merge "Revert "Revert "Add plugin API to use cas@1.1 new interface"""