Add buffer cache to Message and Bundle