Added LRU support (needs testing)