Resolve option error and caching issue