Added incorrect caching with #ifndef/#endif blocks