IMPROVED: do not export expand cache outside module