No need to use the caching mechanism when called once
Small refactoring
Merge with public