Fixed boost caching issue