First 2013 commit: Changes for caching actions and some bugs fixed