Avoid looking up parameters already cached in instance variables
Merge pull request #1608 from ferrous26/tweak

Avoid looking up parameters already cached in instance variables