Merge "Address static cache access issues."