Performance improvement - use cached term fetching function
Merge pull request #3 from borkweb/6310-followup

Performance improvement - use cached term fetching function