Added first version of basic caching options to storage: based on expiration date and based on amount