Bugfix which resolves cache_options issue