Revert "making cache and class structures"

This reverts commit e6f8418713111e0e74c4fc713d4ad5e9d5ee78b0.