Some bug fixes related to new smarty caching system.<br />Some performane fixes