Editing: CacheAware.php