removed storing of class source for each evaluation