Fix for issues #3931 and #3932

Created a new branch to clean up previous pull request. 
Seems only defining `hashCode` is not enough also there is a need for  `equals`. Otherwise one can still see that `duplication effect` if two interceptors are not equal.