Changes required by memoizer-plugins