Revert "caching"

This reverts commit a666012213da383bb7d0159f9e62c13300cff6e1.