[WIP] NOT WORKING! Refactoring of bundle, mainly cache usage, required stuff etc.