Fixed handling of cache option.