Lots of changes to option system. Introduced cache.