Don't cache and remove uuid tracker