Did some refactoring.
Made it produce more trace output for the verification result caching.
Fixed minor issue.