Refactor target profile caching