[IMP] Cache bundles in ir.attachments instead of a LRU

Forward ported from 8.0's commit: 8402625