Updated taxonomy to get called after cache is flushed

Same as #2375 but for 3.0-unstable