Fixed problems with enabled cache