Branch Blocker: Change to access API and cache API: https://www.drupal.org/node/2344683