changes for new release of media cache + clean code