Refactor cache and framework bundle