Revert cache size changes

This will need some love first