Merge branch 'aws-revert-ttl-cache' into 'master'

Reverting the TTL as it causes integration tests failuers in other services.

See merge request !689 (merged)

(cherry picked from commit bb0b6226)

3e500291 Reverting the TTL as it causes integration tests failuers in other services.