Reworked cache system to not need a container class.