Fix allocator caching