update
better cache handling