PictureStorage should not cache the id but keep a reference to picture

Also replaced .any? with .present?