updated functionality if cahce is disabled, tests to be added