Revert "Caching is the bane of my existance"

This reverts commit 313701620596f20c629fb586a982b825c8a72b7f.