Fixed issues with bundling & caching conflicting