Removed dependency on activesupport
Made optional cache checking more aggressive