Updated static cache to use drupal static cache