fix after regression to failing tests because of moving where currentData defined
remove non-working memoization