Minor refactor to CachedThreadPool
Updated TODO