issue6557_2: Add option as param instead of booleans + correct comments
Issue6557_2: Avoid using FF cache on every request