Get rid of cache system completely as it is buggy
Make easy method