Add more tests for CachingTargetLocator
Remove unused import