Fixed better debug and made the partial resolver cache work correctly