fixed cacheing and evaler bugs