Removed WIP CachingSupport feature