Add short cache to core