fixed caching in Option