Changing API cache to be as long as user requests
(cherry picked from commit 60b4198d677b6ad333d035b31a92b1546f0bf9b8)