Revert "cache and suo"

This reverts commit b75001ac1ee0d89f63c64b714636914339542f67.