Cache & coments fixes