Switch to using (optionally) Zend_Cache. Whitespace fix