Merging fix from safemode branch -r12759, forgot to cache a few variables
Authored by: safemode 2010-03-25
Parent: [r12759]
Child: [r12761]