WIP: Need to add build constructor to remaining caches