Removed uneccessary cache decorators.