moved caching system on Options, removed from registry