diff --git a/frontend/src/api.js b/frontend/src/api.js
index c485fcc..312fd6c 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -2,13 +2,13 @@ import axios from 'axios'
 
 const API_PREFIX = '/plugins/bugit/api'
 
-export const getTemplate = (path) => {
+export const getTemplate = (path, cacheName) => {
   let url = API_PREFIX + '/template'
   if (path) {
     return axios({
       url: url,
       method: 'POST',
-      data: { path }
+      data: { path, cache_name: cacheName }
     })
   } else {
     return axios({
@@ -23,7 +23,7 @@ export const getDevices = () => {
   })
 }
 
-//------EventInspector------
+// ------EventInspector------
 
 export const getEvent = (options) => {
   let url = '/api/event'
@@ -98,10 +98,25 @@ export const getCache = (key) => {
   })
 }
 
-export const setCache = (key, data) => {
+export const setCache = (key, templatePath, cacheName, data) => {
   return axios({
     url: API_PREFIX + '/cache/' + key,
     method: 'POST',
-    data: data
+    data: {
+      template_path: templatePath,
+      cache_name: cacheName,
+      data
+    }
+  })
+}
+
+export const deleteCache = (key, templatePath, cacheName) => {
+  return axios({
+    url: API_PREFIX + '/cache/' + key,
+    method: 'DELETE',
+    data: {
+      cache_name: cacheName,
+      template_path: templatePath
+    }
   })
 }
diff --git a/frontend/src/components/BugTemplateSelector.vue b/frontend/src/components/BugTemplateSelector.vue
index d8f4b71..0774814 100644
--- a/frontend/src/components/BugTemplateSelector.vue
+++ b/frontend/src/components/BugTemplateSelector.vue
@@ -1,29 +1,106 @@
 <template>
   <Form :label-width="80" class="split-left-template-selector">
-    <FormItem label="template">
-      <Select v-model="selectedTemplateIndex" filterable size="small" placeholder="Select template">
-        <Option v-for="(template, index) in templates" :value="index" :key="index">{{template.name}}</Option>
-      </Select>
-    </FormItem>
+    <Row>
+      <i-col span="12">
+        <FormItem label="template">
+          <Select
+            v-model="selectedTemplateIndex"
+            filterable
+            size="small"
+            placeholder="Select template"
+            not-found-text="No saved draft"
+          >
+            <Option v-for="(template, index) in templates" :value="index" :key="index">{{ template.name }}</Option>
+          </Select>
+        </FormItem>
+      </i-col>
+      <i-col span="12">
+        <FormItem label="Draft">
+          <Select
+            v-model="selectedDraft"
+            filterable
+            clearable
+            size="small"
+            placeholder="Select a saved draft"
+            not-found-text="No Template"
+          >
+            <Option
+              v-for="(template, index) in cacheList"
+              :value="template.cacheName"
+              :key="index"
+            >{{template.cacheName}}<Icon
+                v-show="template.cacheName===selectedCache"
+                class="icon-form"
+                style="float: right"
+                type="md-trash"
+                @click="isShownDeleteModal = true"
+              />
+            </Option>
+          </Select>
+        </FormItem>
+      </i-col>
+    </Row>
+    <Modal v-model="isShownDeleteModal">
+      <p slot="header" style="color: #f60; text-align: center">
+        <Icon type="ios-information-circle"/>
+        <span>Delete confirmation</span>
+      </p>
+      <div style="text-align: center">
+        <span style="font-size: 14px">
+          Are you sure you want to delete draft <b>{{selectedCache}}</b>?
+        </span>
+      </div>
+      <div slot="footer">
+        <Button type="error" long @click="onDelete">Delete</Button>
+      </div>
+    </Modal>
   </Form>
 </template>
 
 <script>
 export default {
-  created() {
+  data () {
+    return {
+      isShownDeleteModal: false
+    }
+  },
+  created () {
     this.$store.dispatch('loadTemplateList')
   },
+  methods: {
+    onDelete () {
+      this.$store.dispatch('deleteCache', this.selectedCache)
+      this.isShownDeleteModal = false
+    }
+  },
   computed: {
-    templates() {
+    templates () {
       return this.$store.state.form.templates
     },
+    selectedCache () {
+      return this.$store.state.form.selectedCache
+    },
+    cacheList () {
+      return this.$store.state.form.cacheList
+    },
     selectedTemplateIndex: {
-      get() {
+      get () {
         return this.$store.state.form.selectedTemplateIndex
       },
-      set(val) {
+      set (val) {
         this.$store.dispatch('updateSelectedTemplateIndex', val)
       }
+    },
+    selectedDraft: {
+      get () {
+        return this.$store.state.form.selectedCache
+      },
+      set (val) {
+        if (val !== undefined) {
+          this.$store.commit('setSelectedCache', val)
+          this.$store.dispatch('loadTemplate')
+        }
+      }
     }
   }
 }
diff --git a/frontend/src/components/Bugit.vue b/frontend/src/components/Bugit.vue
index 9ec0698..d8fcabc 100644
--- a/frontend/src/components/Bugit.vue
+++ b/frontend/src/components/Bugit.vue
@@ -46,12 +46,13 @@ export default {
     onKeyDown (event) {
       if (event.key === 'Meta') {
         this.metaKey = true
-      }
-      else if (event.key == 's') {
+      } else if (event.key === 's') {
         if (this.metaKey) {
           window.event.preventDefault()
-          this.$store.dispatch('saveCache')
+          this.$store.commit('setShownDraftNameModal', true)
         }
+      } else if (event.key === 'Enter' && this.$store.state.form.shownDraftNameModal) {
+        this.$store.dispatch('saveCache')
       }
     },
     onKeyUp (event) {
diff --git a/frontend/src/components/form/SnapshotItem.vue b/frontend/src/components/form/SnapshotItem.vue
index 4a22c4e..cd1fba9 100644
--- a/frontend/src/components/form/SnapshotItem.vue
+++ b/frontend/src/components/form/SnapshotItem.vue
@@ -13,10 +13,10 @@
 export default {
   props: ['data', 'index'],
   methods: {
-    deleteAttach(data) {
-      this.$store.commit('deleteSnapshot', this.index )
+    deleteAttach (data) {
+      this.$store.commit('deleteSnapshot', this.index)
     },
-    displayAttach(data) {
+    displayAttach (data) {
       this.$bus.$emit('displayAttach', data)
     }
   }
diff --git a/frontend/src/components/form/Submit.vue b/frontend/src/components/form/Submit.vue
index 73445dd..0de5b7a 100644
--- a/frontend/src/components/form/Submit.vue
+++ b/frontend/src/components/form/Submit.vue
@@ -13,30 +13,62 @@
       </i-col>
       <i-col span="6">
         <Tooltip content="Save (⌘+s)" placement="top" :delay="500">
-          <Button @click="onSave" long type="info">
+          <Button @click="shownDraftNameModal = true" long type="info">
             <span>
               <b>Draft</b>
             </span>
           </Button>
         </Tooltip>
       </i-col>
+      <Modal v-model="shownDraftNameModal" title="Create Draft">
+        <Row>
+          <i-col span="3" align="right">
+            <span>Name:</span>
+          </i-col>
+          <i-col span="18" offset="1">
+            <Input v-model="createName" clearable size="small" />
+          </i-col>
+        </Row>
+        <div slot="footer">
+          <Button type="primary" long @click="onSave">Save</Button>
+        </div>
+      </Modal>
     </Row>
   </div>
 </template>
 
 <script>
 export default {
+  computed: {
+    submitLock () {
+      return this.$store.state.form.submitLock
+    },
+    shownDraftNameModal: {
+      get () {
+        return this.$store.state.form.shownDraftNameModal
+      },
+      set (val) {
+        this.$store.commit('setShownDraftNameModal', val)
+      }
+    },
+    createName: {
+      get () {
+        return this.$store.state.form.createName
+      },
+      set (val) {
+        this.$store.commit('setCreateName', val)
+      }
+    }
+  },
   methods: {
     onSubmit () {
       this.$store.dispatch('submit')
     },
     onSave () {
       this.$store.dispatch('saveCache')
-    }
-  },
-  computed: {
-    submitLock () {
-      return this.$store.state.form.submitLock
+    },
+    selectCacheName (name) {
+      this.$store.dispatch('loadTemplate', name)
     }
   }
 }
@@ -44,7 +76,7 @@ export default {
 
 <style scoped>
 .ivu-tooltip {
-    display: inline-block;
-    width: 100%;
+  display: inline-block;
+  width: 100%;
 }
 </style>
diff --git a/frontend/src/store/form.js b/frontend/src/store/form.js
index 9e60eff..390e9b8 100644
--- a/frontend/src/store/form.js
+++ b/frontend/src/store/form.js
@@ -1,11 +1,12 @@
 import * as api from '@/api'
 import { bus } from '@/eventbus'
-import crypto from 'crypto'
 
 export default {
   state: {
     templates: [],
+    cacheList: [],
     selectedTemplateIndex: null,
+    selectedCache: null,
     templateDetail: null,
     formInfo: null,
     ruleValidate: null,
@@ -16,6 +17,8 @@ export default {
     shownFileName: null,
     submitLock: false,
     loadTemplate: false,
+    shownDraftNameModal: false,
+    createName: 'Default',
     shownFileContent: {
       code: null,
       type: null,
@@ -29,9 +32,15 @@ export default {
     setTemplates (state, templates) {
       state.templates = templates
     },
+    setCacheList (state, cacheList) {
+      state.cacheList = cacheList
+    },
     setSelectedTemplateIndex (state, selectedTemplateIndex) {
       state.selectedTemplateIndex = selectedTemplateIndex
     },
+    setSelectedCache (state, selectedCache) {
+      state.selectedCache = selectedCache
+    },
     setTemplateDetail (state, templateDetail) {
       state.templateDetail = templateDetail
     },
@@ -41,6 +50,12 @@ export default {
     setLoadTemplate (state, isLoad) {
       state.loadTemplate = isLoad
     },
+    setShownDraftNameModal (state, shownDraftNameModal) {
+      state.shownDraftNameModal = shownDraftNameModal
+    },
+    setCreateName (state, createName) {
+      state.createName = createName
+    },
     updateFormInfo (state, template) {
       for (let i in state.metadata) {
         if (state.metadata[i].key === template) {
@@ -95,14 +110,32 @@ export default {
     loadTemplateList ({ commit, dispatch }) {
       api.getTemplate().then(response => {
         if (response.data.code === 1000) {
-          commit('setSelectedTemplateIndex', response.data.selected_index)
+          commit('setSelectedTemplateIndex', response.data.selected_template_index)
           commit('setTemplates', response.data.templates)
+          commit('setSelectedCache', response.data.selected_cache)
+          commit('setCacheList', response.data.drafts)
           dispatch('loadTemplate')
         } else {
           bus.$emit('msg.error', response.data.message)
         }
       })
     },
+    loadCacheList ({ state, commit }) {
+      if (state.selectedTemplateIndex === null) {
+        return
+      }
+      const selectedTemplate = state.templates[state.selectedTemplateIndex]
+      api.getCache(selectedTemplate.id)
+        .then(response => {
+          if (response.data.code === 1000) {
+            commit('setCacheList', response.data.data)
+          } else {
+            bus.$emit('msg.error', 'Load draft error: ' + response.data.message)
+          }
+        }).catch(error => {
+          bus.$emit('msg.error', 'Load draft error: ' + error)
+        })
+    },
     loadTemplate ({ state, commit }) {
       if (state.selectedTemplateIndex === null) {
         return
@@ -110,16 +143,18 @@ export default {
       const path = state.templates[state.selectedTemplateIndex].path
       commit('setTemplateDetail', [])
       commit('setLoadTemplate', true)
-      api.getTemplate(path).then(response => {
+      api.getTemplate(path, state.selectedCache).then(response => {
         commit('setTemplateDetail', response.data)
         commit('setLoadTemplate', false)
-      }).catch(response => {
-        bus.$emit('message', response.data)
+      }).catch(error => {
+        bus.$emit('message', 'Load template detail error: ' + error)
         commit('setLoadTemplate', false)
       })
     },
-    updateSelectedTemplateIndex ({ commit, dispatch }, selectedTemplateIndex) {
+    updateSelectedTemplateIndex ({ commit, dispatch, state }, selectedTemplateIndex) {
       commit('setSelectedTemplateIndex', selectedTemplateIndex)
+      commit('setSelectedCache', null)
+      dispatch('loadCacheList')
       dispatch('loadTemplate')
     },
     setExtraMsgUpward ({ state, commit }, indexes) {
@@ -166,24 +201,44 @@ export default {
       commit('deleteAttachment', attachment.index)
       api.removeAttachment(attachment.id)
     },
-    saveCache ({ state }) {
+    saveCache ({ state, dispatch, commit }) {
+      if (!state.createName || state.createName.trim().length === 0) {
+        bus.$emit('msg.error', 'Draft name should not be empty!')
+        return
+      }
       if (state.selectedTemplateIndex === null) {
         return
       }
-      const selectedTemplate = state.templates[state.selectedTemplateIndex]
-      const md5 = crypto.createHash('md5')
-      md5.update(selectedTemplate.path)
-      const templateKey = md5.digest('hex')
-      api.setCache(templateKey, state.templateDetail).then(response => {
-        if (response.data.code === 1000) {
-          bus.$emit('msg.success', 'Save as draft, success')
-        } else {
-          bus.$emit('msg.error', 'Save draft failed: ' + response.message)
-        }
-      }).catch(response => {
-        bus.$emit('msg.error', 'Can\'t save as draft')
-        console.error('Can\'t save as draft', response)
-      })
+      const template = state.templates[state.selectedTemplateIndex]
+      api.setCache(template.id, template.path, state.createName, state.templateDetail)
+        .then(response => {
+          if (response.data.code === 1000) {
+            bus.$emit('msg.success', 'Save as draft ' + state.createName + ', success')
+            commit('setSelectedCache', state.createName)
+            commit('setShownDraftNameModal', false)
+            dispatch('loadTemplate')
+            dispatch('loadCacheList')
+          } else {
+            bus.$emit('msg.error', 'Save draft error: ' + response.data.message)
+          }
+        }).catch(response => {
+          bus.$emit('msg.error', 'Save draft error:' + response)
+        })
+    },
+    deleteCache ({ state, dispatch, commit }, draftName) {
+      const template = state.templates[state.selectedTemplateIndex]
+      api.deleteCache(template.id, template.path, draftName)
+        .then(response => {
+          if (response.data.code === 1000) {
+            bus.$emit('msg.success', 'Delete success!')
+            commit('setSelectedCache', state.selectedCache)
+            dispatch('loadCacheList')
+          } else {
+            bus.$emit('msg.error', 'Delete failed error: ' + response.data.message)
+          }
+        }).catch(error => {
+          bus.$emit('msg.error', 'Delete failed error: ' + error)
+        })
     }
   }
 }
diff --git a/lyrebird_bugit/apis.py b/lyrebird_bugit/apis.py
index 0191ab3..0db1cca 100644
--- a/lyrebird_bugit/apis.py
+++ b/lyrebird_bugit/apis.py
@@ -14,40 +14,63 @@
 from . import cache
 from . import attachment
 import traceback
-from hashlib import md5
 
 
 logger = log.get_logger()
 
 def template():
     if request.method == 'GET':
+        '''
+        Get all template list, all draft list, last selected template and last selected draft
+        '''
+        draft_version = cache.check_draft_version()
+        if draft_version < cache.DRAFT_VERSION_V_1_8_0:
+            logger.info('Updating draft into v1.8.0 from v1.7.0')
+            cache.update_selected_template()
+            cache.update_all_draft_file()
+
         templates = template_loader.template_list()
-        selected_index = None
         last_selected_template = cache.get_selected_template()
+        selected_template_index = None
         for index, template in enumerate(templates):
             if template['path'] == last_selected_template:
-                selected_index = index
-        return application.make_ok_response(selected_index=selected_index, templates=templates)
+                selected_template_index = index
+                break
+        if not selected_template_index:
+            return application.make_ok_response(templates=templates)
+
+        template_key = cache.get_filename(last_selected_template)
+        drafts = cache.get_draft_list(template_key)
+        last_selected_cache = cache.get_selected_cache()
+
+        return application.make_ok_response(
+            selected_template_index=selected_template_index,
+            templates=templates,
+            selected_cache=last_selected_cache,
+            drafts=drafts
+        )
+
     elif request.method == 'POST':
         '''
         Get template detail by path
         And save lastest_selected_template
         '''
-        if request.json and 'path' in request.json:
-            template_path = request.json['path']
-            template = template_loader.get_template(template_path)
-            # load from cache
-            template_key = md5(template_path.encode()).hexdigest()
-            template_detail = cache.get(template_key)
-            # load from template
-            if inspect.getargspec(template.form).args:
-                template_detail = template.form({'cache': template_detail})
-            else:
-                template_detail = template.form()
-            cache.selected_template(template_path)
-            return jsonify(template_detail)
+        if not request.json or not request.json.get('path'):
+            return application.make_fail_response('Missing required argument: path')
+
+        template_path = request.json['path']
+        draft_name = request.json.get('cache_name', '')
+        draft_filename = cache.get_filename(template_path, draft_name)
+        template_detail = cache.get(draft_filename)
+
+        template = template_loader.get_template(template_path)
+        if inspect.getargspec(template.form).args:
+            template_detail = template.form({'cache': template_detail})
         else:
-            return application.make_fail_response('Need path argument for getting template detail')
+            template_detail = template.form()
+
+        cache.selected_template(template_path, draft_name)
+        return jsonify(template_detail)
 
 
 def issue():
@@ -111,7 +134,7 @@ def take_screenshot(platform, device_id):
     lyrebird.publish(channel.lower(), cmd)
     return application.make_ok_response(message=f'Take screenshot success!')
 
-#get available device from iOS&Android plugin
+# Get available device from iOS&Android plugin
 def device():
     if request.method == 'GET':
         all_devices = [
@@ -155,17 +178,49 @@ def attachments(attachment_id=None):
         return make_ok_response()
 
 
-def ui_cache(key):
+def ui_cache(template_key):
     if request.method == 'GET':
-        data = cache.get(key)
-        if data:
-            return application.make_ok_response(data=data)
-        else:
-            return application.make_fail_response(f'Not found cache by key {key}')
+        data = cache.get_draft_list(template_key)
+        return application.make_ok_response(data=data)
+
     elif request.method == 'POST':
-        data = request.json
-        for field in data:
+        template_path = request.json.get('template_path')
+        if not template_path:
+            return application.make_fail_response('Missing required argument: template_path')
+
+        cache_name = request.json.get('cache_name')
+        if not cache_name:
+            return application.make_fail_response('Missing required argument: cache_name')
+
+        template_detail = request.json.get('data')
+        if not template_detail:
+            return application.make_fail_response('Missing required argument: data')
+
+        for field in template_detail:
             if 'extraMsg' in field:
                 del field['extraMsg']
-        cache.put(key, data)
+
+        all_drafts = cache.get_draft_list(template_key)
+        for draft in all_drafts:
+            if draft.get('cacheName') == cache_name:
+                return application.make_fail_response('Duplicated draft name!')
+
+        draft_name = cache.get_filename(template_path, cache_name)
+        cache.put(draft_name, template_detail)
+        cache.put(f'{draft_name}{cache.DRAFT_INFO_FILE_SUFFIX}', {'cache_name': cache_name})
+        cache.selected_template(template_path, cache_name)
+        return application.make_ok_response()
+
+    elif request.method == 'DELETE':
+        template_path = request.json.get('template_path')
+        if not template_path:
+            return application.make_fail_response('Missing required argument: template_path')
+
+        cache_name = request.json.get('cache_name')
+        if not cache_name:
+            return application.make_fail_response('Missing required argument: cache_name')
+
+        draft_name = cache.get_filename(template_path, cache_name)
+        cache.delete(draft_name)
+        cache.delete(f'{draft_name}{cache.DRAFT_INFO_FILE_SUFFIX}')
         return application.make_ok_response()
diff --git a/lyrebird_bugit/cache.py b/lyrebird_bugit/cache.py
index 143646f..8ca693b 100644
--- a/lyrebird_bugit/cache.py
+++ b/lyrebird_bugit/cache.py
@@ -1,12 +1,21 @@
-from pathlib import Path
-import codecs
 import json
+import codecs
 import lyrebird
+from hashlib import md5
+from pathlib import Path
+from packaging import version
 
 
+logger = lyrebird.log.get_logger()
+
 BUGIT_STORAGE = lyrebird.get_plugin_storage()
 CACHE_ROOT = Path(BUGIT_STORAGE)/'cache'
 LAST_SELECT_TEMPLATE_FILENAME = 'selected_template'
+BUGIT_SYSTEM_FILENAME = [LAST_SELECT_TEMPLATE_FILENAME]
+DRAFT_INFO_FILE_SUFFIX = '.info'
+DEFAULT_DRAFT_NAME = 'Default'
+DRAFT_VERSION_V_1_7_0 = version.parse('1.7.0')
+DRAFT_VERSION_V_1_8_0 = version.parse('1.8.0')
 
 
 def get(template_key):
@@ -17,16 +26,89 @@ def put(template_key, data):
     _save_cache_to_file(template_key, data)
 
 
-def selected_template(template_path):
-    _save_cache_to_file(LAST_SELECT_TEMPLATE_FILENAME, {'path': template_path})
+def delete(template_key):
+    _delete_cache_from_file(template_key)
+
+
+def get_filename(template_path, draft_name=''):
+    template_key = md5(template_path.encode()).hexdigest()
+    if not draft_name:
+        return f'{template_key}'
+
+    draft_key = md5(draft_name.encode()).hexdigest()
+    return f'{template_key}_{draft_key}'
+
+
+def selected_template(template_path, cache_name):
+    _save_cache_to_file(LAST_SELECT_TEMPLATE_FILENAME, {'path': template_path, 'cache_name': cache_name})
 
 
 def get_selected_template():
     _cache = _read_cache_from_file(LAST_SELECT_TEMPLATE_FILENAME)
-    if _cache:
-        return _cache.get('path')
-    else:
+    if not _cache:
         return None
+    return _cache.get('path')
+
+
+def get_selected_cache():
+    _cache = _read_cache_from_file(LAST_SELECT_TEMPLATE_FILENAME)
+    if not _cache:
+        return None
+    return _cache.get('cache_name')
+
+
+def get_draft_list(template_key):
+    draft_list = []
+    for draft_file in CACHE_ROOT.iterdir():
+        if draft_file.suffix != DRAFT_INFO_FILE_SUFFIX:
+            continue
+        if template_key not in str(draft_file):
+            continue
+
+        try:
+            with codecs.open(draft_file, 'r') as f:
+                cache_name = json.load(f).get('cache_name')
+                draft_list.append({'cacheName': cache_name})
+        except Exception:
+            logger.error(f'Load BugIt cache fail! {str(draft_file)}')
+
+    draft_list.sort(key=lambda x: x['cacheName'])
+    return draft_list
+
+
+def check_draft_version():
+    _cache = _read_cache_from_file(LAST_SELECT_TEMPLATE_FILENAME)
+    if not _cache:
+        return DRAFT_VERSION_V_1_8_0
+    if 'cache_name' in _cache:
+        return DRAFT_VERSION_V_1_8_0
+    return DRAFT_VERSION_V_1_7_0
+
+
+def update_selected_template():
+    _cache = _read_cache_from_file(LAST_SELECT_TEMPLATE_FILENAME)
+    _cache['cache_name'] = DEFAULT_DRAFT_NAME
+    _save_cache_to_file(LAST_SELECT_TEMPLATE_FILENAME, _cache)
+
+
+def update_all_draft_file():
+    cache_key = str(md5(DEFAULT_DRAFT_NAME.encode()).hexdigest())
+
+    for cache_file in CACHE_ROOT.iterdir():
+        if cache_file.name.startswith('.'):
+            continue
+        if cache_file.name in BUGIT_SYSTEM_FILENAME:
+            continue
+
+        file_name = f'{cache_file.name}_{cache_key}'
+        detail_path = CACHE_ROOT / file_name
+        info_path = CACHE_ROOT / f'{file_name}.info'
+        cache_file.rename(detail_path)
+        try:
+            with open(info_path, 'w') as f:
+                f.write(json.dumps({'cache_name': DEFAULT_DRAFT_NAME}, ensure_ascii=False))
+        except Exception:
+            logger.error(f'Update cache error! {str(cache_file)}')
 
 
 def _check_dir():
@@ -37,7 +119,7 @@ def _check_dir():
 def _save_cache_to_file(name, data):
     _check_dir()
     with codecs.open(str(CACHE_ROOT / name), 'w') as f:
-        f.write(json.dumps(data))
+        f.write(json.dumps(data, ensure_ascii=False))
 
 
 def _read_cache_from_file(name):
@@ -50,3 +132,8 @@ def _read_cache_from_file(name):
             return json.load(f)
     except Exception:
         return None
+
+def _delete_cache_from_file(name):
+    target_file = CACHE_ROOT / name
+    if target_file.exists() and target_file.is_file():
+        target_file.unlink()
diff --git a/lyrebird_bugit/manifest.py b/lyrebird_bugit/manifest.py
index c4f2b4c..fa49363 100644
--- a/lyrebird_bugit/manifest.py
+++ b/lyrebird_bugit/manifest.py
@@ -14,7 +14,7 @@
         ('/api/take_screenshot/<string:platform>/<string:device_id>', apis.take_screenshot, ['GET']),
         ('/api/attachments', apis.attachments, ['GET']),
         ('/api/attachments/<string:attachment_id>', apis.attachments, ['GET', 'PUT', 'DELETE']),
-        ('/api/cache/<string:key>', apis.ui_cache, ['GET', 'POST'])
+        ('/api/cache/<string:template_key>', apis.ui_cache, ['GET', 'POST', 'DELETE'])
     ],
     event=[
         ('android.device', event_handler.on_android_device),
diff --git a/lyrebird_bugit/template_loader.py b/lyrebird_bugit/template_loader.py
index 13bfc4f..82a743f 100644
--- a/lyrebird_bugit/template_loader.py
+++ b/lyrebird_bugit/template_loader.py
@@ -1,5 +1,6 @@
 import imp
 import traceback
+from hashlib import md5
 from pathlib import Path
 from lyrebird import application
 from lyrebird import get_logger
@@ -32,8 +33,11 @@ def template_list():
             logger.debug(f'Load template {template_file}')
             template = imp.load_source(template_file.stem, str(template_file))
             template_check(template)
-            template_list.append(
-                {'name': template.name, 'path': str(template_file)})
+            template_list.append({
+                'name': template.name,
+                'path': str(template_file),
+                'id': md5(str(template_file).encode()).hexdigest()
+            })
             del template
         except Exception:
             logger.error(
diff --git a/setup.py b/setup.py
index 8a1840f..607867f 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name='lyrebird-bugit',
-    version='1.7.0',
+    version='1.8.0',
     packages=['lyrebird_bugit'],
     url='https://github.com/Meituan-Dianping/lyrebird-bugit',
     author='HBQA',