Removed chaching for more convinient use