CRM-12321 - Revert BAO_Cache changes

http://issues.civicrm.org/jira/browse/CRM-12321