Moved onto new cleaner fqn finder and implemented cache and count