Use class object for hash instead of the class method because class method id's change between calls.
Merge pull request #2315 from matham/clock-hash

Use class object for hash instead of the class method