Reverted back to Guava cache which is slightly slower but better behaved since it does not require a separate cleanup thread.