Fix caching issues in plan controller, handle new attributes, revert to correct version of Rails model lookup code (caused Cartridge.prefix to be reset)