Merge "Add LRU cache with expiry class" into main