Merge "Shell: Grant CACHE_CONTENT to Shell"