Fix for comments + phased caching.