Fix bug with caching and comma separated targets