Use custom cache expiration logic

Use custom cache expiration logic #82