[HRSPLT-44] - Fixed some minor caching issues.