Hyperion: another fix for cacheablility...